@skmtc/core 0.28.5 → 0.28.6

package/script/context/GenerateContext.js

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _GenerateContext_instances, _GenerateContext_files, _GenerateContext_previews, _GenerateContext_captureChannel, _GenerateContext_enrichmentAudit, _GenerateContext_reportSkippedEnrichment, _GenerateContext_schemaRefNames, _GenerateContext_subjectDefaults, _GenerateContext_runOasOperationGenerator, _GenerateContext_runWebhookGenerator, _GenerateContext_runGqlOperationGenerator, _GenerateContext_runModelGenerator, _GenerateContext_addPreview, _GenerateContext_toContentSettingsExportPath, _GenerateContext_ejectedBySuffixedPath_get, _GenerateContext_ejectedBySuffixedPathCache;
+var _GenerateContext_instances, _GenerateContext_files, _GenerateContext_previews, _GenerateContext_captureChannel, _GenerateContext_enrichmentAudit, _GenerateContext_reportSkippedEnrichment, _GenerateContext_schemaRefNames, _GenerateContext_subjectDefaults, _GenerateContext_runOasOperationGenerator, _GenerateContext_runWebhookGenerator, _GenerateContext_runGqlOperationGenerator, _GenerateContext_runModelGenerator, _GenerateContext_addPreview, _GenerateContext_toContentSettingsExportPath, _GenerateContext_ejectedBySuffixedPath_get, _GenerateContext_ejectedBySuffixedPathCache, _GenerateContext_findContainer, _GenerateContext_toContainer;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toModelSource = exports.toGqlOperationSource = exports.toWebhookSource = exports.toOasOperationSource = exports.GenerateContext = void 0;
 const normalize_js_1 = require("../deps/jsr.io/@std/path/1.1.6/normalize.js");
@@ -22,12 +22,15 @@ const OasOperationDriver_js_1 = require("../dsl/operation/oas/OasOperationDriver
 const WebhookDriver_js_1 = require("../dsl/webhook/WebhookDriver.js");
 const GqlOperationDriver_js_1 = require("../dsl/operation/gql/GqlOperationDriver.js");
 const ModelDriver_js_1 = require("../dsl/model/ModelDriver.js");
+const ProjectionOptions_js_1 = require("../types/ProjectionOptions.js");
+const InsertOptions_js_1 = require("../types/InsertOptions.js");
 const ContentSettings_js_1 = require("../dsl/ContentSettings.js");
 const Variant_js_1 = require("../types/Variant.js");
 const toVariantList_js_1 = require("../helpers/toVariantList.js");
 const get_js_1 = __importDefault(require("lodash-es/get.js"));
 const Inserted_js_1 = require("../dsl/Inserted.js");
 const CodeFileBase_js_1 = require("../dsl/CodeFileBase.js");
+const DefinitionContainer_js_1 = require("../dsl/DefinitionContainer.js");
 const JsonFile_js_1 = require("../dsl/JsonFile.js");
 const MarkdownFile_js_1 = require("../dsl/MarkdownFile.js");
 const tiny_invariant_1 = __importDefault(require("tiny-invariant"));
@@ -77,7 +80,7 @@ const EnrichmentWarning_js_1 = require("../enrichments/EnrichmentWarning.js");
  * ```
  */
 const isGqlInsertOperationArgs = (args) => args.operation.oasType === 'gqlOperation';
-const isGqlToOperationSettingsArgs = (args) => args.operation.oasType === 'gqlOperation';
+const isGqlToOperationSettingsFields = (args) => args.operation.oasType === 'gqlOperation';
 /** A non-null object — the subject-scope leaf of an enrichment-defaults umbrella
  *  (`{ fields, title, … }`). Narrows `unknown` without an `as` cast. */
 const isEnrichmentLeaf = (value) => typeof value === 'object' && value !== null;
@@ -523,7 +526,7 @@ class GenerateContext {
      *
      * @mutates this.files
      */
-    register({ imports = [], reExports = [], definitions, custom, destinationPath }) {
+    register({ imports = [], reExports = [], definitions, custom, destinationPath, into }) {
         const normalizedPath = (0, normalize_js_1.normalize)(destinationPath);
         const currentFile = this.getFile(normalizedPath);
         // `register` never creates files — it speaks pure data and the engine
@@ -543,9 +546,20 @@ class GenerateContext {
         // policy — are code-file concerns owned by the language subclass.
         // `JsonFile` (no definitions/imports) is skipped by the guard.
         if (currentFile instanceof CodeFileBase_js_1.CodeFileBase) {
+            // Definitions may land in the file or inside a declaration in it;
+            // imports, re-exports and `custom` are always the file's. Resolved
+            // only when a definition is actually placed — `into` alongside
+            // imports alone must not throw for a container nothing needed. The
+            // test is the same one the loop below applies: the array is
+            // `(DefinitionBase | undefined)[]`, so a non-zero length is not
+            // proof that anything lands.
+            const placesADefinition = definitions?.some(definition => definition !== undefined) ?? false;
+            const place = into === undefined || !placesADefinition
+                ? currentFile
+                : __classPrivateFieldGet(this, _GenerateContext_instances, "m", _GenerateContext_toContainer).call(this, currentFile, into, normalizedPath);
             definitions?.forEach(definition => {
                 if (definition) {
-                    currentFile.addDefinition(definition);
+                    place.addDefinition(definition);
                 }
             });
             if (imports.length > 0) {
@@ -569,29 +583,13 @@ class GenerateContext {
      * @mutates this.files
      */
     insertOperation(args) {
-        // Default to the canonical variant. Callers who explicitly thread
-        // a variant (e.g. variants-aware Projections threading
-        // `this.settings.variant`) override this default.
-        const variant = args.variant ?? Variant_js_1.DEFAULT_VARIANT;
+        // The Driver defaults `variant` and `noExport` and reads the caller's
+        // options off the call.
         if (isGqlInsertOperationArgs(args)) {
-            const { settings, definition } = new GqlOperationDriver_js_1.GqlOperationDriver({
-                context: this,
-                projection: args.projection,
-                operation: args.operation,
-                destinationPath: args.destinationPath,
-                noExport: args.noExport ?? false,
-                variant
-            });
+            const { settings, definition } = new GqlOperationDriver_js_1.GqlOperationDriver({ ...args, context: this });
             return new Inserted_js_1.Inserted({ settings, definition });
         }
-        const { settings, definition } = new OasOperationDriver_js_1.OasOperationDriver({
-            context: this,
-            projection: args.projection,
-            operation: args.operation,
-            destinationPath: args.destinationPath,
-            noExport: args.noExport ?? false,
-            variant
-        });
+        const { settings, definition } = new OasOperationDriver_js_1.OasOperationDriver({ ...args, context: this });
         return new Inserted_js_1.Inserted({ settings, definition });
     }
     /**
@@ -600,27 +598,19 @@ class GenerateContext {
      * protocol discrimination.
      */
     insertWebhook(args) {
-        const variant = args.variant ?? Variant_js_1.DEFAULT_VARIANT;
-        const { settings, definition } = new WebhookDriver_js_1.WebhookDriver({
-            context: this,
-            projection: args.projection,
-            webhook: args.webhook,
-            destinationPath: args.destinationPath,
-            noExport: args.noExport ?? false,
-            variant
-        });
+        const { settings, definition } = new WebhookDriver_js_1.WebhookDriver({ ...args, context: this });
         return new Inserted_js_1.Inserted({ settings, definition });
     }
     /**
      * Insert a normalized model: dispatch to {@link insertModel} when the schema
      * is a `$ref`, otherwise produce a one-off definition under `fallbackName`.
      */
-    insertNormalizedModel(projection, { schema, fallbackName, destinationPath }, { noExport = false, variant } = {}) {
+    insertNormalizedModel(projection, { schema, fallbackName, destinationPath }, ...rest) {
+        const insertOptions = (0, InsertOptions_js_1.toPeerInsertOptions)(rest);
         if (schema.isRef()) {
             const { definition } = this.insertModel(projection, schema.toRefName(), {
-                destinationPath,
-                noExport,
-                variant
+                ...insertOptions,
+                destinationPath
             });
             // @TODO Using mapped types would help avoid generics casting
             return definition;
@@ -653,7 +643,7 @@ class GenerateContext {
             context: this,
             identifier: projection.createIdentifier(fallbackName),
             value,
-            noExport
+            noExport: insertOptions.noExport
         });
         this.register({ definitions: [definition], destinationPath: normalizedPath });
         // @TODO Using mapped types would help avoid generics casting
@@ -668,19 +658,15 @@ class GenerateContext {
      *
      * @mutates this.files
      */
-    insertModel(projection, refName, { destinationPath, noExport = false, variant } = {}) {
-        // Default to the canonical variant. Callers who explicitly thread
-        // a variant (e.g. variants-aware Projections threading
-        // `this.settings.variant`) override this default.
-        const resolvedVariant = variant ?? Variant_js_1.DEFAULT_VARIANT;
+    insertModel(projection, refName, ...rest) {
+        // The Driver defaults `variant` and `noExport` and reads the caller's
+        // options off the call.
         const { settings, definition } = new ModelDriver_js_1.ModelDriver({
             context: this,
             projection,
             refName,
-            destinationPath,
             rootRef: refName,
-            noExport,
-            variant: resolvedVariant
+            ...(0, InsertOptions_js_1.toInsertOptions)(rest)
         });
         return new Inserted_js_1.Inserted({ settings, definition });
     }
@@ -690,9 +676,12 @@ class GenerateContext {
      * `toEnrichments` against the
      * given operation.
      */
-    toOperationContentSettings(args) {
-        const variant = args.variant ?? Variant_js_1.DEFAULT_VARIANT;
-        if (isGqlToOperationSettingsArgs(args)) {
+    toOperationContentSettings(settingsArgs) {
+        const variant = settingsArgs.variant ?? Variant_js_1.DEFAULT_VARIANT;
+        const options = (0, ProjectionOptions_js_1.readProjectionOptions)(settingsArgs);
+        // The subject is narrowed on the plain fields; the options slot is read once above.
+        const args = settingsArgs;
+        if (isGqlToOperationSettingsFields(args)) {
             const enrichments = args.projection.toEnrichments({
                 operation: args.operation,
                 context: this,
@@ -703,14 +692,16 @@ class GenerateContext {
                     name: args.projection.toIdentifierName({
                         operation: args.operation,
                         enrichments,
-                        variant
+                        variant,
+                        options
                     }),
                     ...args.projection.toIdentifierType(args.operation, this)
                 }),
                 exportPath: __classPrivateFieldGet(this, _GenerateContext_instances, "m", _GenerateContext_toContentSettingsExportPath).call(this, args.projection.toExportPath({
                     operation: args.operation,
                     enrichments,
-                    variant
+                    variant,
+                    options
                 })),
                 enrichments,
                 variant
@@ -726,15 +717,20 @@ class GenerateContext {
                 name: args.projection.toIdentifierName({
                     operation: args.operation,
                     enrichments,
-                    variant
+                    variant,
+                    options
                 }),
                 ...args.projection.toIdentifierType(args.operation, this)
             }),
-            exportPath: __classPrivateFieldGet(this, _GenerateContext_instances, "m", _GenerateContext_toContentSettingsExportPath).call(this, args.projection.toExportPath({
-                operation: args.operation,
-                enrichments,
-                variant
-            })),
+            exportPath: __classPrivateFieldGet(this, _GenerateContext_instances, "m", _GenerateContext_toContentSettingsExportPath).call(this, 
+            // A member has no file of its own: the Driver passes its container's.
+            args.exportPath ??
+                args.projection.toExportPath({
+                    operation: args.operation,
+                    enrichments,
+                    variant,
+                    options
+                })),
             enrichments,
             variant
         });
@@ -746,6 +742,7 @@ class GenerateContext {
      */
     toWebhookContentSettings(args) {
         const variant = args.variant ?? Variant_js_1.DEFAULT_VARIANT;
+        const options = (0, ProjectionOptions_js_1.readProjectionOptions)(args);
         const enrichments = args.projection.toEnrichments({
             webhook: args.webhook,
             context: this,
@@ -756,14 +753,16 @@ class GenerateContext {
                 name: args.projection.toIdentifierName({
                     webhook: args.webhook,
                     enrichments,
-                    variant
+                    variant,
+                    options
                 }),
                 ...args.projection.toIdentifierType(args.webhook, this)
             }),
             exportPath: __classPrivateFieldGet(this, _GenerateContext_instances, "m", _GenerateContext_toContentSettingsExportPath).call(this, args.projection.toExportPath({
                 webhook: args.webhook,
                 enrichments,
-                variant
+                variant,
+                options
             })),
             enrichments,
             variant
@@ -777,14 +776,16 @@ class GenerateContext {
      * identifier is assembled through the projection's language
      * (`lang.toIdentifier`).
      */
-    toModelContentSettings({ refName, projection, variant = Variant_js_1.DEFAULT_VARIANT }) {
+    toModelContentSettings(args) {
+        const { refName, projection, variant = Variant_js_1.DEFAULT_VARIANT } = args;
+        const options = (0, ProjectionOptions_js_1.readProjectionOptions)(args);
         const enrichments = projection.toEnrichments({ refName, context: this, variant });
         return new ContentSettings_js_1.ContentSettings({
             identifier: projection.lang.toIdentifier({
-                name: projection.toIdentifierName({ refName, enrichments, variant }),
+                name: projection.toIdentifierName({ refName, enrichments, variant, options }),
                 ...projection.toIdentifierType(refName, this)
             }),
-            exportPath: __classPrivateFieldGet(this, _GenerateContext_instances, "m", _GenerateContext_toContentSettingsExportPath).call(this, projection.toExportPath({ refName, enrichments, variant })),
+            exportPath: __classPrivateFieldGet(this, _GenerateContext_instances, "m", _GenerateContext_toContentSettingsExportPath).call(this, projection.toExportPath({ refName, enrichments, variant, options })),
             enrichments,
             variant
         });
@@ -817,12 +818,20 @@ class GenerateContext {
      * @param { name, exportPath }
      * @returns Matching definition if found or `undefined` otherwise
      */
-    findDefinition({ name, exportPath }) {
+    findDefinition({ name, exportPath, into }) {
         // Pure lookup — no file is created on a miss. Definitions live on the
         // code-file subclass, so narrow; a non-code file (`JsonFile`) has none.
         // The cache wants the single primary for the name → first match.
         const file = this.getFile(exportPath);
-        return file instanceof CodeFileBase_js_1.CodeFileBase ? file.findDefinitions({ name })?.[0] : undefined;
+        if (!(file instanceof CodeFileBase_js_1.CodeFileBase)) {
+            return undefined;
+        }
+        // Resolve the place, then ask it once — the same two steps `register`
+        // takes. A miss on the container is a miss on the member: nothing is
+        // created here, and a member cannot exist before the definition holding
+        // it.
+        const place = into === undefined ? file : __classPrivateFieldGet(this, _GenerateContext_instances, "m", _GenerateContext_findContainer).call(this, file, into);
+        return place?.findDefinitions({ name })?.[0];
     }
 }
 exports.GenerateContext = GenerateContext;
@@ -1175,6 +1184,16 @@ _GenerateContext_files = new WeakMap(), _GenerateContext_previews = new WeakMap(
         })), "f");
     }
     return __classPrivateFieldGet(this, _GenerateContext_ejectedBySuffixedPathCache, "f");
+}, _GenerateContext_findContainer = function _GenerateContext_findContainer(file, into) {
+    const definition = file.findDefinitions({ name: into })?.[0];
+    return definition && (0, DefinitionContainer_js_1.isDefinitionContainer)(definition.value) ? definition.value : undefined;
+}, _GenerateContext_toContainer = function _GenerateContext_toContainer(file, into, path) {
+    const definition = file.findDefinitions({ name: into })?.[0];
+    (0, tiny_invariant_1.default)(definition, `Cannot register into '${into}' in '${path}' — no declaration of that name exists. ` +
+        `Register the container before its members, or look it up with findDefinition first.`);
+    (0, tiny_invariant_1.default)((0, DefinitionContainer_js_1.isDefinitionContainer)(definition.value), `Cannot register into '${into}' in '${path}' — that declaration does not hold members. ` +
+        `Its value must implement addDefinition and findDefinitions.`);
+    return definition.value;
 };
 /**
  * Match a `(path, method, variant)` tuple against an operation-shaped

package/script/context/ParseContext.d.ts

@@ -212,4 +212,3 @@ export declare class ParseContext {
      */
     logSkippedFields({ skipped, stackTrail, parent, parentType, type }: LogSkippedValuesArgs): void;
 }
-//# sourceMappingURL=ParseContext.d.ts.map

package/script/context/ParseIssue.d.ts

@@ -97,4 +97,3 @@ export type ParseIssue = {
     location: string;
     message: string;
 };
-//# sourceMappingURL=ParseIssue.d.ts.map

package/script/context/RenderContext.d.ts

@@ -185,4 +185,3 @@ export declare class RenderContext {
     pick({ name, exportPath }: PickArgs): DefinitionBase | undefined;
 }
 export {};
-//# sourceMappingURL=RenderContext.d.ts.map

package/script/context/ResultsHandler.d.ts

@@ -108,4 +108,3 @@ export declare class ResultsHandler extends BaseHandler implements LogHandlerBas
      */
     destroy(): void;
 }
-//# sourceMappingURL=ResultsHandler.d.ts.map

package/script/context/StackTrail.d.ts

@@ -206,4 +206,3 @@ export declare class StackTrail {
      */
     toString(): string;
 }
-//# sourceMappingURL=StackTrail.d.ts.map