feat: Switched to using identifying parameters

Author: kevinwang5658

README.md

@@ -18,7 +18,7 @@ $ npm install -g codify
 $ codify COMMAND
 running command...
 $ codify (--version)
-codify/0.5.1 darwin-arm64 node-v20.15.1
+codify/0.6.0 darwin-arm64 node-v20.15.1
 $ codify --help [COMMAND]
 USAGE
   $ codify COMMAND
@@ -62,7 +62,7 @@ EXAMPLES
   $ codify apply --path ~
 ```
 
-_See code: [src/commands/apply/index.ts](https://github.com/kevinwang5658/codify/blob/v0.5.1/src/commands/apply/index.ts)_
+_See code: [src/commands/apply/index.ts](https://github.com/kevinwang5658/codify/blob/v0.6.0/src/commands/apply/index.ts)_
 
 ## `codify destroy`
 
@@ -89,7 +89,7 @@ EXAMPLES
   $ codify destroy homebrew nvm
 ```
 
-_See code: [src/commands/destroy.ts](https://github.com/kevinwang5658/codify/blob/v0.5.1/src/commands/destroy.ts)_
+_See code: [src/commands/destroy.ts](https://github.com/kevinwang5658/codify/blob/v0.6.0/src/commands/destroy.ts)_
 
 ## `codify help [COMMAND]`
 
@@ -113,7 +113,7 @@ _See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v6.2.1
 
 ## `codify import`
 
-Generate codify configs from existing installations
+Generate codify configs from already installed packages. Use a list of space separated arguments to specify the resource types to import. Leave blank to import all resource in an existing *.codify.json file.
 
 ```
 USAGE
@@ -130,13 +130,40 @@ GLOBAL FLAGS
   --json  Format output as json.
 
 DESCRIPTION
-  Generate codify configs from existing installations
+  Generate codify configs from already installed packages. Use a list of space separated arguments to specify the
+  resource types to import. Leave blank to import all resource in an existing *.codify.json file.
+
+  Modes:
+  1. No args: if no args are specified and an *.codify.json already exists. Then codify will update the existing file
+  with any new changes to the resources specified in the file/files.
+
+  Command: codify import
+
+  2. With args: specify specific resources to import using arguments. Wild card matching is supported using '*' and ?
+  (Note: in zsh * expands to the current dir and needs to be escaped using \* or '*'). A prompt will be shown if more
+  information is required to complete the import.
+
+  Example: codify import nvm asdf\*, codify import \* (for importing all supported resources)
+
+  The results can then be saved:
+  a. To an existing *.codify.json file
+  b. To a new file
+  c. Or only printed to console
+
+  Codify will try to smartly insert new configs by following existing spacing and formatting.
+
 
 EXAMPLES
-  $ codify import homebrew nvm
+  $ codify import homebrew nvm asdf\*
+
+  $ codify import
+
+  $ codify import git-clone --path ../my/other/folder
+
+  $ codify import \*
 ```
 
-_See code: [src/commands/import.ts](https://github.com/kevinwang5658/codify/blob/v0.5.1/src/commands/import.ts)_
+_See code: [src/commands/import.ts](https://github.com/kevinwang5658/codify/blob/v0.6.0/src/commands/import.ts)_
 
 ## `codify plan`
 
@@ -164,7 +191,7 @@ EXAMPLES
   $ codify plan
 ```
 
-_See code: [src/commands/plan/index.ts](https://github.com/kevinwang5658/codify/blob/v0.5.1/src/commands/plan/index.ts)_
+_See code: [src/commands/plan/index.ts](https://github.com/kevinwang5658/codify/blob/v0.6.0/src/commands/plan/index.ts)_
 
 ## `codify update [CHANNEL]`
 

package-lock.json

@@ -4,7 +4,7 @@
     "codify": "./bin/run.js"
   },
   "dependencies": {
-    "@codifycli/ink-form": "0.0.3",
+    "@codifycli/ink-form": "0.0.5",
     "@homebridge/node-pty-prebuilt-multiarch": "^0.12.0-beta.5",
     "@inkjs/ui": "^2",
     "@oclif/core": "^4.0.8",
@@ -13,7 +13,7 @@
     "ajv": "^8.12.0",
     "ajv-formats": "^3.0.1",
     "chalk": "^5.3.0",
-    "codify-schemas": "^1.0.69",
+    "codify-schemas": "^1.0.70",
     "debug": "^4.3.4",
     "detect-indent": "^7.0.1",
     "diff": "^7.0.0",
@@ -117,7 +117,7 @@
     "start:dev": "./bin/dev.js",
     "start:vm": "npm run build && npm run pack:macos && npm run start:vm"
   },
-  "version": "0.5.1",
+  "version": "0.6.0",
   "bugs": "https://github.com/kevinwang5658/codify/issues",
   "keywords": [
     "oclif"

package.json

@@ -26,7 +26,6 @@ The results can then be saved:
   
 Codify will try to smartly insert new configs by following existing spacing and formatting.
 `
-  static override args = ''
 
   static override examples = [
     '<%= config.bin %> <%= command.id %> homebrew nvm asdf\\*',

src/commands/import.ts

@@ -102,8 +102,12 @@ export class ResourceConfig implements ConfigBlock {
       throw new Error(`checkResourceInfo specified but no resource info provided (${this.type}) (other: ${other.type})`)
     }
 
-    const thisRequiredKeys = new Set(this.resourceInfo.getRequiredParameters().map((p) => p.name));
-    const otherRequiredKeys = new Set(other.resourceInfo.getRequiredParameters().map((p) => p.name));
+    if (!this.resourceInfo.allowMultiple || !other.resourceInfo.allowMultiple) {
+      return true;
+    }
+
+    const thisRequiredKeys = new Set(this.resourceInfo.allowMultiple.identifyingParameters);
+    const otherRequiredKeys = new Set(other.resourceInfo.allowMultiple.identifyingParameters);
 
     const thisRequiredParameters = Object.fromEntries(Object.entries(this.parameters)
       .filter(([k]) => thisRequiredKeys.has(k))

src/entities/resource-config.ts

@@ -20,6 +20,10 @@ export class ResourceInfo implements GetResourceInfoResponseData {
     requiredParameters: null | string[];
   } | undefined;
 
+  allowMultiple?: {
+    identifyingParameters: string[];
+  };
+
   private parametersCache?: ParameterInfo[];
 
   private constructor() {}

src/entities/resource-info.ts

@@ -1,5 +1,4 @@
 import { 
-  GetResourceInfoResponseData,
   ImportResponseData,
   ResourceJson,
   ValidateResponseData,

src/plugins/plugin-manager.ts

@@ -45,7 +45,8 @@ export function DefaultComponent(props: {
     }
     {
       renderStatus === RenderStatus.PROGRESS && (
-        <ProgressDisplay emitter={spinnerEmitter} eventType="data"/>
+        <Box/>
+        // <ProgressDisplay emitter={spinnerEmitter} eventType="data"/>
       )
     }
     {
@@ -96,9 +97,10 @@ export function DefaultComponent(props: {
     }
     {
       renderStatus === RenderStatus.DISPLAY_IMPORT_RESULT && (
-        <Static items={[renderData as { importResult: ImportResult; showConfigs: boolean }]}>{
-          (renderData, idx) => <ImportResultComponent importResult={renderData.importResult} key={idx} showConfigs={renderData.showConfigs} />
-        }</Static>
+        <Box/>
+        // <Static items={[renderData as { importResult: ImportResult; showConfigs: boolean }]}>{
+        //   (renderData, idx) => <ImportResultComponent importResult={renderData.importResult} key={idx} showConfigs={renderData.showConfigs} />
+        // }</Static>
       )
     }
     {

src/ui/components/default-component.tsx

@@ -227,7 +227,7 @@ export class FileModificationCalculator {
       const source = sourceMap.lookup(`/${sourceIndex}/${key}`);
       if ((Array.isArray(value) || typeof value === 'object') && source && source.value.line === source.valueEnd.line) {
         const { value, valueEnd } = parsedSourceMap.lookup(`#/${key}`)!
-        content = this.splice(content, value.position, valueEnd.position - value.position, JSON.stringify(parsedContent[key]))
+        content = this.splice(content, value.position, valueEnd.position - value.position, JSON.stringify(parsedContent[key], null, ' '))
       }
     }