@quadnix/octo-build 0.0.17 → 0.1.0

package/dist/commands/create-app/generator-octo-app-template/generators/app/templates/src/aws-ecs-server/octo.yaml.ejs

@@ -7,6 +7,20 @@ env:
     kind: string
     value: "123456789123"
 
+terraform:
+  requiredVersion: "1.6.0"
+  requiredProviders:
+    aws:
+      source: hashicorp/aws
+  providers:
+    - providerType: aws
+      accountId: "${env.AWS_ACCOUNT_ID}"
+      # Optional. Puts a name in the generated provider alias in place of the account number.
+      # accountName: prod
+      regionId: us-east-1
+      spec:
+        profile: default
+
 settings:
   listeners:
     - type: HtmlReportEventListener

package/dist/commands/create-app/generator-octo-app-template/generators/app/templates/src/aws-s3-website/octo.yaml.ejs

@@ -10,6 +10,20 @@ env:
     kind: string
     value: my-website-unique-bucket
 
+terraform:
+  requiredVersion: "1.6.0"
+  requiredProviders:
+    aws:
+      source: hashicorp/aws
+  providers:
+    - providerType: aws
+      accountId: "${env.AWS_ACCOUNT_ID}"
+      # Optional. Puts a name in the generated provider alias in place of the account number.
+      # accountName: prod
+      regionId: us-east-1
+      spec:
+        profile: default
+
 settings:
   listeners:
     - type: HtmlReportEventListener

package/dist/commands/create-app/generator-octo-app-template/generators/app/templates/tsconfig.json.ejs

@@ -20,9 +20,6 @@
     "strictBindCallApply": true,
     "strictNullChecks": true,
     "target": "ES2022",
-    "typeRoots": [
-      "node_modules/@types"
-    ],
     "useDefineForClassFields": false,
     "verbatimModuleSyntax": true
   },

package/dist/commands/{create-resource/create-resource.command.d.ts → create-external-resource/create-external-resource.command.d.ts}

@@ -1,5 +1,5 @@
 import type { ArgumentsCamelCase, Argv } from 'yargs';
-export declare const createResourceCommand: {
+export declare const createExternalResourceCommand: {
     builder: (yargs: Argv) => Argv;
     command: string;
     describe: string;

package/dist/commands/create-external-resource/create-external-resource.command.js

@@ -0,0 +1,64 @@
+import { dirname, resolve } from 'path';
+import { fileURLToPath } from 'url';
+import chalk from 'chalk';
+import { createEnv } from 'yeoman-environment';
+import { StringUtility } from '../../utilities/string/string.utility.js';
+const __dirname = dirname(fileURLToPath(import.meta.url));
+export const createExternalResourceCommand = {
+    builder: (yargs) => {
+        return yargs
+            .option('name', {
+            alias: 'n',
+            demandOption: true,
+            description: 'Name of the resource to create. Should be in kebab-case (e.g., my-awesome-resource).',
+            type: 'string',
+        })
+            .option('package', {
+            demandOption: true,
+            description: 'Package name for the resource.',
+            type: 'string',
+        })
+            .option('path', {
+            alias: 'p',
+            default: '.',
+            description: 'Root directory path of the project.',
+            type: 'string',
+        });
+    },
+    command: 'create-external-resource',
+    // Named for the lifecycle, not as the general case: a resource terraform manages is the common
+    // one, and that is `create-terraform-resource`. This generator emits the other kind - a resource
+    // whose add/delete run as SDK calls, which terraform drives by shelling back into `run-action`.
+    describe: 'Create a new Octo resource whose lifecycle runs outside Terraform.',
+    handler: async (argv) => {
+        const { name, package: packageName, path } = argv;
+        // Validate resource name format (should be kebab-case)
+        if (!StringUtility.isKebabCase(name)) {
+            console.error(chalk.red('Resource name must be in kebab-case format (e.g., my-vpc)'));
+            process.exit(1);
+        }
+        // Rejected here rather than at registration: the decorator runs this same check, but only once
+        // the generated resource is loaded, long after the files are on disk.
+        if (!StringUtility.isValidPackageName(packageName)) {
+            console.error(chalk.red(`Invalid package name "${packageName}"! Expected e.g. @octo or my-package.`));
+            process.exit(1);
+        }
+        console.log(chalk.blue(`Creating external resource "${name}" with package "${packageName}"...`));
+        const env = createEnv();
+        env.register(resolve(__dirname, 'generator-octo-external-resource-template/generators/app/index.js'), {
+            namespace: 'generator-octo-external-resource-template:app',
+        });
+        try {
+            await env.run(['generator-octo-external-resource-template:app', name, packageName, path], {
+                skipCache: true,
+                skipInstall: true,
+            });
+            console.log(chalk.green(`Successfully created external resource!`));
+        }
+        catch (error) {
+            console.error(chalk.red(`Failed to create external resource! ${error.message}`));
+            process.exit(1);
+        }
+    },
+};
+//# sourceMappingURL=create-external-resource.command.js.map

package/dist/commands/create-external-resource/create-external-resource.command.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"create-external-resource.command.js","sourceRoot":"","sources":["../../../src/commands/create-external-resource/create-external-resource.command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAC;AAEzE,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAE1D,MAAM,CAAC,MAAM,6BAA6B,GAAG;IAC3C,OAAO,EAAE,CAAC,KAAW,EAAQ,EAAE;QAC7B,OAAO,KAAK;aACT,MAAM,CAAC,MAAM,EAAE;YACd,KAAK,EAAE,GAAG;YACV,YAAY,EAAE,IAAI;YAClB,WAAW,EAAE,sFAAsF;YACnG,IAAI,EAAE,QAAQ;SACf,CAAC;aACD,MAAM,CAAC,SAAS,EAAE;YACjB,YAAY,EAAE,IAAI;YAClB,WAAW,EAAE,gCAAgC;YAC7C,IAAI,EAAE,QAAQ;SACf,CAAC;aACD,MAAM,CAAC,MAAM,EAAE;YACd,KAAK,EAAE,GAAG;YACV,OAAO,EAAE,GAAG;YACZ,WAAW,EAAE,qCAAqC;YAClD,IAAI,EAAE,QAAQ;SACf,CAAC,CAAC;IACP,CAAC;IACD,OAAO,EAAE,0BAA0B;IACnC,+FAA+F;IAC/F,iGAAiG;IACjG,gGAAgG;IAChG,QAAQ,EAAE,oEAAoE;IAC9E,OAAO,EAAE,KAAK,EAAE,IAAyE,EAAiB,EAAE;QAC1G,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;QAElD,uDAAuD;QACvD,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;YACrC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,2DAA2D,CAAC,CAAC,CAAC;YACtF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,+FAA+F;QAC/F,sEAAsE;QACtE,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,WAAW,CAAC,EAAE,CAAC;YACnD,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,yBAAyB,WAAW,uCAAuC,CAAC,CAAC,CAAC;YACtG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,+BAA+B,IAAI,mBAAmB,WAAW,MAAM,CAAC,CAAC,CAAC;QAEjG,MAAM,GAAG,GAAG,SAAS,EAAE,CAAC;QACxB,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,EAAE,mEAAmE,CAAC,EAAE;YACpG,SAAS,EAAE,+CAA+C;SAC3D,CAAC,CAAC;QAEH,IAAI,CAAC;YACH,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC,+CAA+C,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,CAAC,EAAE;gBACxF,SAAS,EAAE,IAAI;gBACf,WAAW,EAAE,IAAI;aAClB,CAAC,CAAC;YAEH,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAC,CAAC;QACtE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,uCAAuC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;YACjF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;CACF,CAAC"}

package/dist/commands/{create-resource/generator-octo-resource-template → create-external-resource/generator-octo-external-resource-template}/generators/app/index.d.ts

@@ -1,10 +1,25 @@
 import Generator, { type BaseOptions } from 'yeoman-generator';
+/**
+ * @internal
+ */
 export default class extends Generator {
-    private readonly cdkRootDir;
     private readonly packageName;
+    private readonly projectRootDir;
     private readonly resourceName;
+    /**
+     * @internal
+     */
     constructor(args: string[], opts: BaseOptions);
+    /**
+     * @internal
+     */
+    end(): void;
+    /**
+     * @internal
+     */
     initializing(): Promise<void>;
+    /**
+     * @internal
+     */
     writing(): Promise<void>;
-    end(): void;
 }

package/dist/commands/{create-resource/generator-octo-resource-template → create-external-resource/generator-octo-external-resource-template}/generators/app/index.js

@@ -1,16 +1,37 @@
 import { readdir, stat } from 'fs/promises';
 import { join, resolve } from 'path';
 import Generator, {} from 'yeoman-generator';
+import { ProjectIndexUtility } from '../../../../../utilities/project-index/project-index.utility.js';
 import { StringUtility } from '../../../../../utilities/string/string.utility.js';
+/**
+ * @internal
+ */
 export default class extends Generator {
+    /**
+     * @internal
+     */
     constructor(args, opts) {
         super(args, opts);
         this.resourceName = args[0];
         this.packageName = args[1];
-        this.cdkRootDir = args[2];
+        this.projectRootDir = args[2];
     }
+    /**
+     * @internal
+     */
+    end() {
+        const targetPath = resolve(join(this.projectRootDir, 'src', 'resources', this.resourceName));
+        this.log('✅ Your external resource has been generated successfully!');
+        this.log(`📁 Resource created at: ${targetPath}`);
+        ProjectIndexUtility.addImport(this.projectRootDir, `./resources/${this.resourceName}/index.js`);
+        this.log('📦 Next steps:');
+        this.log(`   Address all "Fix me" in generated files`);
+    }
+    /**
+     * @internal
+     */
     async initializing() {
-        const targetPath = resolve(join(this.cdkRootDir, 'src', 'resources', this.resourceName));
+        const targetPath = resolve(join(this.projectRootDir, 'src', 'resources', this.resourceName));
         // Check if directory already exists and is not empty.
         let targetPathStat;
         try {
@@ -30,46 +51,26 @@ export default class extends Generator {
         // Set the destination root to the resource directory.
         this.destinationRoot(targetPath);
     }
+    /**
+     * @internal
+     */
     async writing() {
-        // Create the resource file.
-        this.fs.copyTpl(this.templatePath('resources/resource/resource.ts.ejs'), this.destinationPath(`${this.resourceName}.resource.ts`), {
+        const templateData = {
             packageName: this.packageName,
             resourceName: this.resourceName,
+            resourceNameCamel: StringUtility.toCamelCase(this.resourceName),
             resourceNamePascal: StringUtility.toPascalCase(this.resourceName),
-        });
+        };
+        // Create the resource file.
+        this.fs.copyTpl(this.templatePath('resources/resource/resource.ts.ejs'), this.destinationPath(`${this.resourceName}.resource.ts`), templateData);
         // Create schema file.
-        this.fs.copyTpl(this.templatePath('resources/resource/index.schema.ts.ejs'), this.destinationPath('index.schema.ts'), {
-            resourceNamePascal: StringUtility.toPascalCase(this.resourceName),
-        });
+        this.fs.copyTpl(this.templatePath('resources/resource/index.schema.ts.ejs'), this.destinationPath('index.schema.ts'), templateData);
         // Create index.ts
-        this.fs.copyTpl(this.templatePath('resources/resource/index.ts.ejs'), this.destinationPath('index.ts'), {
-            resourceName: this.resourceName,
-            resourceNamePascal: StringUtility.toPascalCase(this.resourceName),
-        });
+        this.fs.copyTpl(this.templatePath('resources/resource/index.ts.ejs'), this.destinationPath('index.ts'), templateData);
         // Create actions directory and action files
-        this.fs.copyTpl(this.templatePath('resources/resource/actions/add.resource.action.ts.ejs'), this.destinationPath('actions', `add-${this.resourceName}.resource.action.ts`), {
-            resourceName: this.resourceName,
-            resourceNamePascal: StringUtility.toPascalCase(this.resourceName),
-        });
-        this.fs.copyTpl(this.templatePath('resources/resource/actions/delete.resource.action.ts.ejs'), this.destinationPath('actions', `delete-${this.resourceName}.resource.action.ts`), {
-            resourceName: this.resourceName,
-            resourceNamePascal: StringUtility.toPascalCase(this.resourceName),
-        });
-        this.fs.copyTpl(this.templatePath('resources/resource/actions/update-tags.resource.action.ts.ejs'), this.destinationPath('actions', `update-${this.resourceName}-tags.resource.action.ts`), {
-            resourceName: this.resourceName,
-            resourceNamePascal: StringUtility.toPascalCase(this.resourceName),
-        });
-        this.fs.copyTpl(this.templatePath('resources/resource/actions/validate.resource.action.ts.ejs'), this.destinationPath('actions', `validate-${this.resourceName}.resource.action.ts`), {
-            resourceName: this.resourceName,
-            resourceNamePascal: StringUtility.toPascalCase(this.resourceName),
-        });
-    }
-    end() {
-        const targetPath = resolve(join(this.cdkRootDir, 'src', 'resources', this.resourceName));
-        this.log('✅ Your resource has been generated successfully!');
-        this.log(`📁 Resource created at: ${targetPath}`);
-        this.log('📦 Next steps:');
-        this.log(`   Address all "Fix me" in generated files`);
+        this.fs.copyTpl(this.templatePath('resources/resource/actions/add.resource.action.ts.ejs'), this.destinationPath('actions', `add-${this.resourceName}.resource.action.ts`), templateData);
+        this.fs.copyTpl(this.templatePath('resources/resource/actions/delete.resource.action.ts.ejs'), this.destinationPath('actions', `delete-${this.resourceName}.resource.action.ts`), templateData);
+        this.fs.copyTpl(this.templatePath('resources/resource/actions/update.resource.action.ts.ejs'), this.destinationPath('actions', `update-${this.resourceName}.resource.action.ts`), templateData);
     }
 }
 //# sourceMappingURL=index.js.map

package/dist/commands/create-external-resource/generator-octo-external-resource-template/generators/app/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/commands/create-external-resource/generator-octo-external-resource-template/generators/app/index.ts"],"names":[],"mappings":"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"}

package/dist/commands/{create-resource/generator-octo-resource-template → create-external-resource/generator-octo-external-resource-template}/generators/app/templates/resources/resource/actions/add.resource.action.ts.ejs

@@ -19,25 +19,16 @@ export class Add<%= resourceNamePascal %>ResourceAction extends ANodeAction impl
 
   async handle(diff: Diff<<%= resourceNamePascal %>>): Promise<<%= resourceNamePascal %>Schema['response']> {
     // Get properties.
-    const <%= resourceName %> = diff.node;
-    const properties = <%= resourceName %>.properties;
-    const response = <%= resourceName %>.response;
-    const tags = <%= resourceName %>.tags;
+    const <%= resourceNameCamel %> = diff.node;
+    const properties = <%= resourceNameCamel %>.properties;
+    const response = <%= resourceNameCamel %>.response;
+    const tags = <%= resourceNameCamel %>.tags;
 
     // Fix me: Implement the add resource logic.
-    // This is where you would create the actual resource.
+    // This is where you would create the actual resource (SDK call, script, API request, ...).
 
-    // Fix me: Return response properties.
-    return response;
-  }
-
-  async mock(diff: Diff<<%= resourceNamePascal %>>, capture: Partial<<%= resourceNamePascal %>Schema['response']>): Promise<<%= resourceNamePascal %>Schema['response']> {
-    // Get properties.
-    const <%= resourceName %> = diff.node;
-    const properties = <%= resourceName %>.properties;
-    const response = <%= resourceName %>.response;
-
-    // Fix me: Return response using captures.
+    // Fix me: Populate and return every declared response key. Each key must be declared on the
+    // schema's `response` so Octo can emit it as a Terraform output.
     return response;
   }
 }

package/dist/commands/{create-resource/generator-octo-resource-template → create-external-resource/generator-octo-external-resource-template}/generators/app/templates/resources/resource/actions/delete.resource.action.ts.ejs

@@ -1,6 +1,24 @@
 import { ANodeAction, Action, type Diff, DiffAction, Factory, type IResourceAction, hasNodeName } from '@quadnix/octo';
 import { <%= resourceNamePascal %> } from '../<%= resourceName %>.resource.js';
 
+/**
+ * Deletes the resource.
+ *
+ * Unlike add and update, this does **not** run mid-apply. Terraform cannot run it: octo deletes a
+ * resource by removing its block from the configuration, and terraform will not run a
+ * `when = destroy` provisioner for a resource that is no longer in the configuration. So `octo
+ * commit` runs this instead, from the project directory, after terraform has destroyed the
+ * `null_resource`.
+ *
+ * Two consequences worth designing around:
+ *
+ * - **The working directory is not the one add and update saw.** Those run inside a terragrunt
+ *   cache directory; this runs wherever `octo commit` was invoked. Anything positional - a relative
+ *   file path, a relative config lookup - resolves somewhere else. Build absolute paths from a
+ *   module input rather than assuming a cwd.
+ * - **Throwing here aborts the commit**, on purpose: octo state then still records the resource, so
+ *   the next run diffs it again and retries. Failing loudly is better than a silent leak.
+ */
 @Action(<%= resourceNamePascal %>)
 export class Delete<%= resourceNamePascal %>ResourceAction extends ANodeAction implements IResourceAction<<%= resourceNamePascal %>> {
   constructor() {
@@ -18,9 +36,9 @@ export class Delete<%= resourceNamePascal %>ResourceAction extends ANodeAction i
 
   async handle(diff: Diff<<%= resourceNamePascal %>>): Promise<void> {
     // Get properties.
-    const <%= resourceName %> = diff.node;
-    const properties = <%= resourceName %>.properties;
-    const response = <%= resourceName %>.response;
+    const <%= resourceNameCamel %> = diff.node;
+    const properties = <%= resourceNameCamel %>.properties;
+    const response = <%= resourceNameCamel %>.response;
 
     // Fix me: Implement the delete resource logic.
     // This is where you would delete the actual resource.

package/dist/commands/create-external-resource/generator-octo-external-resource-template/generators/app/templates/resources/resource/actions/update.resource.action.ts.ejs

@@ -0,0 +1,63 @@
+import { ANodeAction, Action, type Diff, DiffAction, Factory, type IResourceAction, hasNodeName } from '@quadnix/octo';
+import type { <%= resourceNamePascal %>Schema } from '../index.schema.js';
+import { <%= resourceNamePascal %> } from '../<%= resourceName %>.resource.js';
+
+/**
+ * Handles the two `UPDATE` diffs an external resource receives.
+ *
+ * Neither is optional: a diff that no registered action matches aborts the whole transaction with
+ * "No matching action given for diff!". Deleting this file means a generated resource works until
+ * its first change and then refuses to apply at all.
+ *
+ * - **`properties`** - the default `diffProperties()` emits this whenever a property changes. You
+ *   own the partial-update semantics. `diff.value` carries the changed properties; the resource's
+ *   `properties` already hold the new values. If the underlying API cannot change an attribute in
+ *   place, do not silently skip it - either recreate it here, or override `diffProperties()` on the
+ *   resource to return `DiffAction.REPLACE` with a reason, which routes the change through the add
+ *   and delete actions instead.
+ * - **`parent`** - emitted when a parent is replaced, with `diff.value` naming the new parent. The
+ *   parent's outputs are this resource's inputs, so they have just changed underneath it: re-read
+ *   them from `this.parents` and re-apply. Skipping this case is how an external resource ends up
+ *   pointing at a parent that no longer exists.
+ */
+@Action(<%= resourceNamePascal %>)
+export class Update<%= resourceNamePascal %>ResourceAction extends ANodeAction implements IResourceAction<<%= resourceNamePascal %>> {
+  constructor() {
+    super();
+  }
+
+  filter(diff: Diff): boolean {
+    return (
+      diff.action === DiffAction.UPDATE &&
+      diff.node instanceof <%= resourceNamePascal %> &&
+      hasNodeName(diff.node, '<%= resourceName %>') &&
+      (diff.field === 'properties' || diff.field === 'parent')
+    );
+  }
+
+  async handle(diff: Diff<<%= resourceNamePascal %>>): Promise<<%= resourceNamePascal %>Schema['response']> {
+    // Get properties.
+    const <%= resourceNameCamel %> = diff.node;
+    const properties = <%= resourceNameCamel %>.properties;
+    const response = <%= resourceNameCamel %>.response;
+
+    // Fix me: Implement the update resource logic.
+    // This is where you would apply the changed properties to the actual resource.
+
+    // Fix me: Return every declared response key, re-reading any the update changed. Returning the
+    // response unchanged is what an unimplemented update looks like, and it reports success.
+    return response;
+  }
+}
+
+@Factory<Update<%= resourceNamePascal %>ResourceAction>(Update<%= resourceNamePascal %>ResourceAction)
+export class Update<%= resourceNamePascal %>ResourceActionFactory {
+  private static instance: Update<%= resourceNamePascal %>ResourceAction;
+
+  static async create(): Promise<Update<%= resourceNamePascal %>ResourceAction> {
+    if (!this.instance) {
+      this.instance = new Update<%= resourceNamePascal %>ResourceAction();
+    }
+    return this.instance;
+  }
+}

package/dist/commands/{create-resource/generator-octo-resource-template → create-external-resource/generator-octo-external-resource-template}/generators/app/templates/resources/resource/index.ts.ejs

@@ -1,6 +1,5 @@
 import './actions/add-<%= resourceName %>.resource.action.js';
 import './actions/delete-<%= resourceName %>.resource.action.js';
-import './actions/update-<%= resourceName %>-tags.resource.action.js';
-import './actions/validate-<%= resourceName %>.resource.action.js';
+import './actions/update-<%= resourceName %>.resource.action.js';
 
 export { <%= resourceNamePascal %> } from './<%= resourceName %>.resource.js';

package/dist/commands/create-external-resource/generator-octo-external-resource-template/generators/app/templates/resources/resource/resource.ts.ejs

@@ -0,0 +1,28 @@
+import { AResource, Resource } from '@quadnix/octo';
+import { <%= resourceNamePascal %>Schema } from './index.schema.js';
+
+/**
+ * An external resource: its lifecycle (create / update / delete) runs outside Terraform, in the
+ * resource actions under `./actions` (SDK calls, scripts, API requests). Octo wraps it in a
+ * `null_resource` + `data "external"` at generate time and calls back into the action at apply time.
+ *
+ * For a resource whose lifecycle is managed by Terraform itself, use `create-terraform-resource`.
+ *
+ * Two things an external resource does not get, so that you do not go looking for them:
+ *
+ * - **Tags do not reach it.** The generated `null_resource` triggers on the properties hash and on
+ *   each parent input; `tags` is not among them. A tags-only change therefore re-triggers nothing,
+ *   Terraform does not re-run the provisioner, and no action is invoked. Apply tags inside the
+ *   add/update actions if the underlying API supports them.
+ * - **There is no per-resource validate action.** `octo validate` compares Terraform's plan against
+ *   Octo's own diff; it does not run resource actions.
+ */
+@Resource<<%= resourceNamePascal %>>('<%= packageName %>', '<%= resourceName %>', <%= resourceNamePascal %>Schema)
+export class <%= resourceNamePascal %> extends AResource<<%= resourceNamePascal %>Schema, <%= resourceNamePascal %>> {
+  declare properties: <%= resourceNamePascal %>Schema['properties'];
+  declare response: <%= resourceNamePascal %>Schema['response'];
+
+  constructor(resourceId: string, properties: <%= resourceNamePascal %>Schema['properties'], parents: []) {
+    super(resourceId, properties, parents);
+  }
+}

package/dist/commands/create-external-resource/index.d.ts

@@ -0,0 +1 @@
+export { createExternalResourceCommand } from './create-external-resource.command.js';

package/dist/commands/create-external-resource/index.js

@@ -0,0 +1,2 @@
+export { createExternalResourceCommand } from './create-external-resource.command.js';
+//# sourceMappingURL=index.js.map

package/dist/commands/create-external-resource/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/create-external-resource/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,6BAA6B,EAAE,MAAM,uCAAuC,CAAC"}

package/dist/commands/create-model/create-model.command.js

@@ -28,7 +28,7 @@ export const createModelCommand = {
             .option('path', {
             alias: 'p',
             default: '.',
-            description: 'Root directory path of the CDK.',
+            description: 'Root directory path of the project.',
             type: 'string',
         });
     },

package/dist/commands/create-model/create-model.command.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-model.command.js","sourceRoot":"","sources":["../../../src/commands/create-model/create-model.command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAC;AAEzE,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAE1D,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAChC,OAAO,EAAE,CAAC,KAAW,EAAQ,EAAE;QAC7B,OAAO,KAAK;aACT,MAAM,CAAC,MAAM,EAAE;YACd,KAAK,EAAE,GAAG;YACV,YAAY,EAAE,IAAI;YAClB,WAAW,EACT,mGAAmG;YACrG,IAAI,EAAE,QAAQ;SACf,CAAC;aACD,MAAM,CAAC,MAAM,EAAE;YACd,KAAK,EAAE,GAAG;YACV,OAAO,EAAE,aAAa,CAAC,qBAAqB;YAC5C,YAAY,EAAE,IAAI;YAClB,WAAW,EAAE,+CAA+C;YAC5D,IAAI,EAAE,QAAQ;SACf,CAAC;aACD,MAAM,CAAC,SAAS,EAAE;YACjB,YAAY,EAAE,IAAI;YAClB,WAAW,EAAE,6BAA6B;YAC1C,IAAI,EAAE,QAAQ;SACf,CAAC;aACD,MAAM,CAAC,MAAM,EAAE;YACd,KAAK,EAAE,GAAG;YACV,OAAO,EAAE,GAAG;YACZ,WAAW,EAAE,iCAAiC;YAC9C,IAAI,EAAE,QAAQ;SACf,CAAC,CAAC;IACP,CAAC;IACD,OAAO,EAAE,cAAc;IACvB,QAAQ,EAAE,0BAA0B;IACpC,OAAO,EAAE,KAAK,EACZ,IAAuF,EACxE,EAAE;QACjB,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;QAExD,qDAAqD;QACrD,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;YACrC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,oEAAoE,CAAC,CAAC,CAAC;YAC/F,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,8BAA8B,IAAI,cAAc,IAAI,MAAM,CAAC,CAAC,CAAC;QAEpF,MAAM,GAAG,GAAG,SAAS,EAAE,CAAC;QACxB,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,EAAE,uDAAuD,CAAC,EAAE;YACxF,SAAS,EAAE,mCAAmC;SAC/C,CAAC,CAAC;QAEH,IAAI,CAAC;YACH,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC,mCAAmC,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,CAAC,EAAE;gBAClF,SAAS,EAAE,IAAI;gBACf,WAAW,EAAE,IAAI;aAClB,CAAC,CAAC;YAEH,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC,CAAC;QAC1D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,2BAA2B,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;YACrE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;CACF,CAAC"}
+{"version":3,"file":"create-model.command.js","sourceRoot":"","sources":["../../../src/commands/create-model/create-model.command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAC;AAEzE,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAE1D,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAChC,OAAO,EAAE,CAAC,KAAW,EAAQ,EAAE;QAC7B,OAAO,KAAK;aACT,MAAM,CAAC,MAAM,EAAE;YACd,KAAK,EAAE,GAAG;YACV,YAAY,EAAE,IAAI;YAClB,WAAW,EACT,mGAAmG;YACrG,IAAI,EAAE,QAAQ;SACf,CAAC;aACD,MAAM,CAAC,MAAM,EAAE;YACd,KAAK,EAAE,GAAG;YACV,OAAO,EAAE,aAAa,CAAC,qBAAqB;YAC5C,YAAY,EAAE,IAAI;YAClB,WAAW,EAAE,+CAA+C;YAC5D,IAAI,EAAE,QAAQ;SACf,CAAC;aACD,MAAM,CAAC,SAAS,EAAE;YACjB,YAAY,EAAE,IAAI;YAClB,WAAW,EAAE,6BAA6B;YAC1C,IAAI,EAAE,QAAQ;SACf,CAAC;aACD,MAAM,CAAC,MAAM,EAAE;YACd,KAAK,EAAE,GAAG;YACV,OAAO,EAAE,GAAG;YACZ,WAAW,EAAE,qCAAqC;YAClD,IAAI,EAAE,QAAQ;SACf,CAAC,CAAC;IACP,CAAC;IACD,OAAO,EAAE,cAAc;IACvB,QAAQ,EAAE,0BAA0B;IACpC,OAAO,EAAE,KAAK,EACZ,IAAuF,EACxE,EAAE;QACjB,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;QAExD,qDAAqD;QACrD,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;YACrC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,oEAAoE,CAAC,CAAC,CAAC;YAC/F,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,8BAA8B,IAAI,cAAc,IAAI,MAAM,CAAC,CAAC,CAAC;QAEpF,MAAM,GAAG,GAAG,SAAS,EAAE,CAAC;QACxB,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,EAAE,uDAAuD,CAAC,EAAE;YACxF,SAAS,EAAE,mCAAmC;SAC/C,CAAC,CAAC;QAEH,IAAI,CAAC;YACH,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC,mCAAmC,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,CAAC,EAAE;gBAClF,SAAS,EAAE,IAAI;gBACf,WAAW,EAAE,IAAI;aAClB,CAAC,CAAC;YAEH,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC,CAAC;QAC1D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,2BAA2B,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;YACrE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;CACF,CAAC"}

package/dist/commands/create-model/generator-octo-model-template/generators/app/index.d.ts

@@ -1,11 +1,26 @@
 import Generator, { type BaseOptions } from 'yeoman-generator';
+/**
+ * @internal
+ */
 export default class extends Generator {
     private readonly modelType;
-    private readonly cdkRootDir;
     private readonly moduleName;
     private readonly packageName;
+    private readonly projectRootDir;
+    /**
+     * @internal
+     */
     constructor(args: string[], opts: BaseOptions);
+    /**
+     * @internal
+     */
+    end(): void;
+    /**
+     * @internal
+     */
     initializing(): Promise<void>;
+    /**
+     * @internal
+     */
     writing(): Promise<void>;
-    end(): void;
 }

package/dist/commands/create-model/generator-octo-model-template/generators/app/index.js

@@ -1,17 +1,38 @@
 import { readdir, stat } from 'fs/promises';
 import { join, resolve } from 'path';
 import Generator, {} from 'yeoman-generator';
+import { ProjectIndexUtility } from '../../../../../utilities/project-index/project-index.utility.js';
 import { StringUtility } from '../../../../../utilities/string/string.utility.js';
+/**
+ * @internal
+ */
 export default class extends Generator {
+    /**
+     * @internal
+     */
     constructor(args, opts) {
         super(args, opts);
         this.moduleName = args[0];
         this.modelType = args[1];
         this.packageName = args[2];
-        this.cdkRootDir = args[3];
+        this.projectRootDir = args[3];
     }
+    /**
+     * @internal
+     */
+    end() {
+        const targetPath = resolve(join(this.projectRootDir, 'src', 'modules', this.modelType, this.moduleName, 'models', this.modelType));
+        this.log('✅ Your model has been generated successfully!');
+        this.log(`📁 Model created at: ${targetPath}`);
+        ProjectIndexUtility.addImport(this.projectRootDir, `./modules/${this.modelType}/${this.moduleName}/models/${this.modelType}/index.js`);
+        this.log('📦 Next steps:');
+        this.log(`   Address all "Fix me" in generated files`);
+    }
+    /**
+     * @internal
+     */
     async initializing() {
-        const targetPath = resolve(join(this.cdkRootDir, 'src', 'modules', this.modelType, this.moduleName, 'models', this.modelType));
+        const targetPath = resolve(join(this.projectRootDir, 'src', 'modules', this.modelType, this.moduleName, 'models', this.modelType));
         // Check if directory already exists and is not empty.
         let targetPathStat;
         try {
@@ -31,6 +52,9 @@ export default class extends Generator {
         // Set the destination root to the model directory.
         this.destinationRoot(targetPath);
     }
+    /**
+     * @internal
+     */
     async writing() {
         // Create the model file.
         this.fs.copyTpl(this.templatePath('models/model/model.ts.ejs'), this.destinationPath(`${this.moduleName}.model.ts`), {
@@ -57,12 +81,5 @@ export default class extends Generator {
             moduleNamePascal: StringUtility.toPascalCase(this.moduleName),
         });
     }
-    end() {
-        const targetPath = resolve(join(this.cdkRootDir, 'src', 'modules', this.modelType, this.moduleName, 'models', this.modelType));
-        this.log('✅ Your model has been generated successfully!');
-        this.log(`📁 Model created at: ${targetPath}`);
-        this.log('📦 Next steps:');
-        this.log(`   Address all "Fix me" in generated files`);
-    }
 }
 //# sourceMappingURL=index.js.map

package/dist/commands/create-model/generator-octo-model-template/generators/app/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/commands/create-model/generator-octo-model-template/generators/app/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/commands/create-model/generator-octo-model-template/generators/app/index.ts"],"names":[],"mappings":"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"}

package/dist/commands/create-model/generator-octo-model-template/generators/app/templates/models/model/model.ts.ejs

@@ -1,4 +1,6 @@
-import { Model, <%= modelTypePascal %> } from '@quadnix/octo';
+<%# Sorted for the same reason as the schema's imports: `App` sorts before `Model`, `Service` after. -%>
+<% const modelImports = ['Model', modelTypePascal].sort().join(', '); -%>
+import { <%= modelImports %> } from '@quadnix/octo';
 import { <%= moduleNamePascal %>Schema } from './<%= moduleName %>.schema.js';
 
 @Model<<%= moduleNamePascal %>>('<%= packageName %>', '<%= modelType %>', <%= moduleNamePascal %>Schema)

package/dist/commands/create-model/generator-octo-model-template/generators/app/templates/models/model/schema.ts.ejs

@@ -1,4 +1,9 @@
-import { <%= modelTypePascal %>Schema, Schema, Validate } from '@quadnix/octo';
+<%# Sorted here rather than written in a fixed order: the model type is the only variable member,
+    and where it falls among the others depends on its name - `AccountSchema` sorts before `Schema`,
+    `ServiceSchema` after it. A fixed order fails the generated app's own import/order and
+    sort-imports rules for half the model types. -%>
+<% const modelSchemaImports = ['Schema', 'Validate', `${modelTypePascal}Schema`].sort().join(', '); -%>
+import { <%= modelSchemaImports %> } from '@quadnix/octo';
 
 export class <%= moduleNamePascal %>Schema extends <%= modelTypePascal %>Schema {
   // Fix me: Add schema properties specific to your module

package/dist/commands/create-module/create-module.command.js

@@ -28,7 +28,7 @@ export const createModuleCommand = {
             .option('path', {
             alias: 'p',
             default: '.',
-            description: 'Root directory path of the CDK.',
+            description: 'Root directory path of the project.',
             type: 'string',
         });
     },