@firestartr/cli 2.10.0-snapshot-fix-renderer-nondeterminism-2 → 2.10.0

package/build/index.js

@@ -320839,18 +320839,23 @@ async function freeSlot() {
  *
  */
 async function crawlDirectory(dirEnt, exec) {
-    const entries = (await promises_.readdir(dirEnt))
-        .map((entry) => external_path_.join(dirEnt, entry))
-        .sort();
-    for (const entry of entries) {
-        const testDir = await isDir(entry);
-        if (testDir) {
-            await crawlDirectory(entry, exec);
-        }
-        else {
-            await slurpFile(entry, exec);
+    try {
+        const entries = (await promises_.readdir(dirEnt))
+            .map((entry) => external_path_.join(dirEnt, entry))
+            .sort();
+        for (const entry of entries) {
+            const testDir = await isDir(entry);
+            if (testDir) {
+                await crawlDirectory(entry, exec);
+            }
+            else {
+                await slurpFile(entry, exec);
+            }
         }
     }
+    catch (err) {
+        throw `crawlDirectory: ${err} on ${dirEnt}`;
+    }
 }
 function isDir(dirEnt) {
     return promises_.stat(dirEnt)
@@ -324830,6 +324835,15 @@ var ajv_default = /*#__PURE__*/__nccwpck_require__.n(dist_ajv);
                         },
                     },
                 },
+                meta: {
+                    type: 'object',
+                    additionalProperties: false,
+                    properties: {
+                        allow_non_anchored_paths: {
+                            type: 'boolean',
+                        },
+                    },
+                },
             },
             required: ['args', 'feature_name', 'files', 'patches'],
             title: 'root',
@@ -324953,12 +324967,23 @@ function __validateFeatureConfigData(configData) {
     const ajv = new (ajv_default())({
         allowUnionTypes: true,
     });
-    const validate = ajv.compile(src_schema);
+    const allowNonAnchoredPaths = configData.meta?.allow_non_anchored_paths === true;
+    const activeSchema = allowNonAnchoredPaths
+        ? stripAnchoringConstraints(src_schema)
+        : src_schema;
+    const validate = ajv.compile(activeSchema);
     const valid = validate(configData);
     if (!valid) {
         throw `Feature: config.yaml invalid ${JSON.stringify(validate.errors)}`;
     }
 }
+function stripAnchoringConstraints(schemaDef) {
+    const clone = JSON.parse(JSON.stringify(schemaDef));
+    delete clone.definitions.File.properties.src.not;
+    delete clone.definitions.File.properties.dest.not;
+    delete clone.definitions.root.properties.filesTemplates.items.not;
+    return clone;
+}
 function __validateJsonPatches(configData) {
     const keys = Object.keys(configData.patches);
     for (const key of keys) {
@@ -325794,12 +325819,19 @@ function render(featurePath, featureRenderPath, entity, firestartrConfig = {}, f
     if ('filesTemplates' in context.config) {
         expandFiles(featurePath, configData, context);
     }
+    const allowNonAnchoredPaths = allowsNonAnchoredPaths(configData);
     for (const file of context.config.files) {
         const { src, dest } = file;
-        assertSafeRelativePath(src, 'file src');
-        assertSafeRelativePath(dest, 'file dest');
-        resolveInside(featurePath, external_path_default().join('templates', src), 'file src', 'feature directory');
-        resolveInside(featureRenderPath, dest, 'file dest', 'render target directory');
+        if (allowNonAnchoredPaths) {
+            assertNonEmptyString(src, 'file src');
+            assertNonEmptyString(dest, 'file dest');
+        }
+        else {
+            assertSafeRelativePath(src, 'file src');
+            assertSafeRelativePath(dest, 'file dest');
+            resolveInside(featurePath, external_path_default().join('templates', src), 'file src', 'feature directory');
+            resolveInside(featureRenderPath, dest, 'file dest', 'render target directory');
+        }
     }
     const output = { files: [] };
     context.config.files.forEach((file) => {
@@ -325878,14 +325910,17 @@ function buildTemplateArgs(args, context) {
 }
 function expandFiles(featurePath, configData, context) {
     let files = [];
+    const allowNonAnchoredPaths = allowsNonAnchoredPaths(configData);
     for (const tpl of configData.filesTemplates) {
-        const addToFiles = expandFilesTemplate(featurePath, tpl, context);
+        const addToFiles = expandFilesTemplate(featurePath, tpl, context, allowNonAnchoredPaths);
         files = files.concat(addToFiles).flat(Infinity);
     }
     context.config.files = context.config.files.concat(files).flat(Infinity);
 }
-function expandFilesTemplate(featurePath, tplPath, context) {
-    const templatePath = resolveInside(featurePath, tplPath, 'filesTemplates entry', 'feature directory');
+function expandFilesTemplate(featurePath, tplPath, context, allowNonAnchoredPaths) {
+    const templatePath = allowNonAnchoredPaths
+        ? external_path_default().resolve(featurePath, tplPath)
+        : resolveInside(featurePath, tplPath, 'filesTemplates entry', 'feature directory');
     src_logger.debug(`Expanding files section with template located at ${templatePath}`);
     let template;
     try {
@@ -325954,6 +325989,9 @@ function resolveInside(basePath, candidate, what, baseLabel) {
     }
     return target;
 }
+function allowsNonAnchoredPaths(configData) {
+    return configData?.meta?.allow_non_anchored_paths === true;
+}
 
 // EXTERNAL MODULE: external "node:fs"
 var external_node_fs_ = __nccwpck_require__(87561);
@@ -524895,9 +524933,9 @@ const crsStatusSubcommand = {
 };
 
 ;// CONCATENATED MODULE: ./package.json
-const package_namespaceObject = JSON.parse('{"i8":"2.10.0-snapshot-fix-renderer-nondeterminism-2"}');
+const package_namespaceObject = {"i8":"2.10.0"};
 ;// CONCATENATED MODULE: ../../package.json
-const package_namespaceObject_1 = {"i8":"2.9.0"};
+const package_namespaceObject_1 = {"i8":"2.10.0"};
 // EXTERNAL MODULE: ../../node_modules/semver/index.js
 var semver = __nccwpck_require__(77546);
 var semver_default = /*#__PURE__*/__nccwpck_require__.n(semver);

package/build/packages/features_renderer/src/render.d.ts

@@ -5,3 +5,4 @@ export declare function renderContent(template: string, ctx: any): any;
 export declare function assertNonEmptyString(value: unknown, what: string): asserts value is string;
 export declare function assertSafeRelativePath(candidate: unknown, what: string): void;
 export declare function resolveInside(basePath: string, candidate: string, what: string, baseLabel: string): string;
+export declare function allowsNonAnchoredPaths(configData: any): boolean;

package/build/packages/features_renderer/src/schema.d.ts

@@ -39,6 +39,15 @@ declare const _default: {
                         };
                     };
                 };
+                meta: {
+                    type: string;
+                    additionalProperties: boolean;
+                    properties: {
+                        allow_non_anchored_paths: {
+                            type: string;
+                        };
+                    };
+                };
             };
             required: string[];
             title: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firestartr/cli",
-  "version": "2.10.0-snapshot-fix-renderer-nondeterminism-2",
+  "version": "2.10.0",
   "private": false,
   "description": "Commandline tool",
   "main": "build/main.js",