@_linked/cli 1.12.0 → 1.14.0

package/lib/esm/cli-methods.js

@@ -17,6 +17,7 @@ import { createInterface } from 'readline';
 import { debugInfo, execp, execPromise, getFileImports, getFiles, getLastCommitTime, getPackageJSON, isImportOutsideOfPackage, isImportWithMissingExtension, isInvalidLINCDImport, needsRebuilding, } from './utils.js';
 import { renameShippedDotfiles } from './utils/shippedDotfiles.js';
 import { planPackageSetup } from './utils/packageSetup.js';
+import { rewriteExtensionlessImports } from './utils/esmSpecifiers.js';
 import { spawn as spawnChild } from 'child_process';
 import { findNearestPackageJson } from 'find-nearest-package-json';
 import { statSync } from 'fs';
@@ -39,7 +40,7 @@ let dirname__ = typeof __dirname !== 'undefined'
  * `scripts/storage-config.js` (pre-rename). The fallback chain lets older
  * app clones keep booting through the rename.
  */
-// Plan-011: extracted to ./lifecycle.ts so the Vite SSR loader doesn't
+// Extracted to ./lifecycle.ts so the Vite SSR loader doesn't
 // have to graph-walk the rest of cli-methods.ts (which contains many
 // dynamic imports Vite can't analyze). We import for internal callers
 // AND re-export so external consumers can keep importing from here.
@@ -211,7 +212,7 @@ export const createApp = (name_1, ...args_1) => __awaiter(void 0, [name_1, ...ar
 });
 /**
  * iOS bundle identifier from the app domain and prefix:
- * ('formaestudios.com', 'formae') -> 'com.formaestudios.formae'.
+ * ('example.com', 'demo') -> 'com.example.demo'.
  */
 export function reactNativeBundleId(appDomain, appPrefix) {
     const host = appDomain
@@ -247,6 +248,17 @@ function assertReactNativeScaffoldable(targetFolder, appPrefix) {
 }
 /** Placeholder name of the shapes package in defaults/app-react-native. */
 export const RN_SHAPES_TOKEN = 'app-shapes';
+/**
+ * Literal tokens in defaults/app-react-native that are replaced by names
+ * derived from the app prefix: the shapes package and the Fuseki datasets.
+ */
+export function reactNativeTokens(appPrefix) {
+    return {
+        [RN_SHAPES_TOKEN]: `${appPrefix}-shapes`,
+        'app-dev': `${appPrefix}-dev`,
+        'app-test': `${appPrefix}-test`,
+    };
+}
 /**
  * Replace every occurrence of `token` in the text files under `folder`
  * (node_modules and files containing a NUL byte are skipped). A literal token
@@ -309,8 +321,11 @@ export function scaffoldReactNativeApp(targetFolder_1, id_1) {
         }
         // 4a. Rename the shapes package token everywhere: workspaces, .gitignore
         // negation, package names, dependency keys, Jest patterns, import specifiers,
-        // test expectations and docs. Only the literal `app-shapes` token is replaced.
-        replaceTokenInTextFiles(targetFolder, RN_SHAPES_TOKEN, shapesName);
+        // test expectations and docs. The Fuseki dataset tokens (`app-dev`,
+        // `app-test`) are replaced the same way. Only these literal tokens change.
+        for (const [token, value] of Object.entries(reactNativeTokens(appPrefix))) {
+            replaceTokenInTextFiles(targetFolder, token, value);
+        }
         // 4b. Stamp the identity fields that are not the shapes token.
         const rootPkgPath = path.join(targetFolder, 'package.json');
         if (fs.existsSync(rootPkgPath)) {
@@ -353,7 +368,7 @@ export function scaffoldReactNativeApp(targetFolder_1, id_1) {
             }
         }
         // 6. Next steps.
-        log(`Your Linked React Native app is ready at ${chalk.blueBright(targetFolder)}`, `\nNext steps:`, `  ${chalk.blueBright(`cd ${path.basename(targetFolder)}`)}`, `  ${chalk.blueBright('npm test -w apps/mobile')}`, `  ${chalk.blueBright('cd apps/mobile && npx expo run:ios')}`);
+        log(`Your Linked React Native app is ready at ${chalk.blueBright(targetFolder)}`, `\nNext steps:`, `  ${chalk.blueBright(`cd ${path.basename(targetFolder)}`)}`, `  ${chalk.blueBright('npm test')}                                        app and API unit tests`, `  ${chalk.blueBright('cp services/api/.env.example services/api/.env')}  once`, `  ${chalk.blueBright('npm run fuseki:up')}                               Fuseki on :3030 (Docker)`, `  ${chalk.blueBright('npm run api')}                                     API-only backend on :4000`, `  ${chalk.blueBright('npm run test:integration')}                        round trip against Fuseki`, `  ${chalk.blueBright('cd apps/mobile && npx expo run:ios')}`, `See README.md (and services/api/README.md if port 3030 is taken).`);
     });
 }
 // Indirection so tests can replace the scaffold step when exercising createApp.
@@ -1161,7 +1176,7 @@ export const addShapeToBarrel = function (shapeHyphenName, root = process.cwd())
     ensureBackendImportsShapes(root);
     return barrelPath;
 };
-// Exported for Shape-Builder reuse (plan-010 T1d.4): CodeShapeSyncService adds
+// Exported for Shape-Builder reuse: CodeShapeSyncService adds
 // the `import './shapes/<Shape>.js';` line to a generated app package's index.
 export const addLineToIndex = function (line, insertMatchString, root = process.cwd(), insertAtStart = false) {
     //import ontology in index
@@ -1347,7 +1362,7 @@ export const createShape = (name_1, ...args_1) => __awaiter(void 0, [name_1, ...
     log(`Created a new shape class template in ${chalk.magenta(targetFile.replace(basePath, ''))}`);
     // Register the shape in the shapes barrel (src/shapes/index.ts) — NOT the main index —
     // and make sure the barrel is loaded on both boot paths. This is what makes the app
-    // materialize its own shapes on boot (plan-027 / plan-028 handover).
+    // materialize its own shapes on boot.
     const barrelPath = addShapeToBarrel(hyphenName);
     log(`Registered the shape in ${chalk.magenta(barrelPath.replace(basePath, ''))}`);
 });
@@ -1398,7 +1413,7 @@ invalidImports = new Map()) {
     // Start checking each file in the source folder
     for (const file of dir) {
         const filename = path.join(sourceFolder, file);
-        // plan-011 §P7 — skip test sources. Test files (and their helpers/probes)
+        // Skip test sources. Test files (and their helpers/probes)
         // are not part of the shipped ESM contract, so the missing-extension rule
         // isn't load-bearing for them; enforcing it only blocks `linked build`
         // (the real ESM-output gate stays in force for shipped source). This is
@@ -1631,6 +1646,13 @@ export const runMethod = (packageName, method, options) => __awaiter(void 0, voi
                 .then(() => {
                 console.log('Done');
                 process.exit();
+            })
+                // An unmatched method (ServerCallError 501) or a provider error rejects; report it instead of an
+                // unhandled rejection.
+                .catch((err) => {
+                var _a;
+                console.error((_a = err === null || err === void 0 ? void 0 : err.message) !== null && _a !== void 0 ? _a : err);
+                process.exit(1);
             });
         });
     }
@@ -2180,6 +2202,7 @@ export const register = function (registryURL) {
     }
 };
 export const buildPackage = (target_1, target2_1, ...args_1) => __awaiter(void 0, [target_1, target2_1, ...args_1], void 0, function* (target, target2, packagePath = process.cwd(), logResults = true) {
+    var _a;
     // Ensure packagePath is absolute and points to a directory containing package.json; if not, go up until we find one
     // First, resolve to absolute path
     let currentPath = path.isAbsolute(packagePath)
@@ -2222,6 +2245,7 @@ export const buildPackage = (target_1, target2_1, ...args_1) => __awaiter(void 0
         }).start();
     }
     let buildProcess = Promise.resolve(true);
+    let warned = false;
     let buildStep = (step) => {
         buildProcess = buildProcess.then((previousResult) => {
             if (!previousResult) {
@@ -2235,11 +2259,14 @@ export const buildPackage = (target_1, target2_1, ...args_1) => __awaiter(void 0
                 //if a build step returns a string,
                 //a warning is shown but the build is still successful with warnings
                 if (typeof stepResult === 'string') {
-                    // spinner.text = step.name + ' - ' + stepResult;
+                    warned = true;
                     if (logResults) {
                         spinner.warn(step.name + ' - ' + stepResult);
                         spinner.stop();
                     }
+                    else {
+                        console.warn(chalk.yellow(step.name + ' - ' + stepResult));
+                    }
                     //can still continue
                     return true;
                 }
@@ -2254,29 +2281,104 @@ export const buildPackage = (target_1, target2_1, ...args_1) => __awaiter(void 0
                         spinner.fail(step.name + ' - ' + stepResult.error);
                         spinner.stop();
                     }
+                    else {
+                        console.error(chalk.red(step.name + ' - ' + stepResult.error));
+                    }
                     //failed and should stop
                     return false;
                 }
             });
         });
     };
-    buildStep({
-        name: 'Checking imports',
-        apply: () => checkImports(packagePath + '/src'),
+    if (((_a = pkgJson.linked) === null || _a === void 0 ? void 0 : _a.extensionlessImports) === true) {
+        const skipped = "Skipping the import check: package.json sets 'linked.extensionlessImports'";
+        logResults ? spinner.info(skipped) : console.log(skipped);
+    }
+    planBuildSteps(pkgJson, packagePath).forEach(buildStep);
+    let success = yield buildProcess.catch((err) => {
+        let msg = typeof err === 'string' || err instanceof Error
+            ? err.toString()
+            : err.error && !err.error.toString().includes('Command failed:')
+                ? err.error
+                : err.stdout + '\n' + err.stderr;
+        if (logResults) {
+            spinner.stopAndPersist({
+                symbol: chalk.red('✖'),
+                // text: 'Build failed',
+            });
+        }
+        else {
+            console.error(chalk.red(packagePath.split('/').pop(), ' - Build failed:'));
+            console.error(err);
+            return msg;
+        }
+        console.log(msg);
     });
-    buildStep({
+    //will be undefined if there was an error
+    if (typeof success !== 'undefined' && success !== false) {
+        if (logResults) {
+            spinner.stopAndPersist({
+                symbol: chalk.greenBright('✔'),
+                text: success === true && !warned
+                    ? 'Build successful'
+                    : 'Build successful with warnings',
+            });
+        }
+    }
+    else {
+        if (logResults) {
+            spinner.stopAndPersist({
+                symbol: chalk.red('✖'),
+                text: 'Build failed',
+            });
+        }
+    }
+    return success;
+});
+// The ordered `linked build` steps for a linkedPackage. A package whose source
+// uses extensionless relative imports (`"linked": {"extensionlessImports": true}`)
+// skips the import check and gets `.js` added to its emitted ESM specifiers.
+export const planBuildSteps = (pkgJson, packagePath) => {
+    var _a;
+    const extensionlessImports = ((_a = pkgJson.linked) === null || _a === void 0 ? void 0 : _a.extensionlessImports) === true;
+    const steps = [];
+    if (!extensionlessImports) {
+        steps.push({
+            name: 'Checking imports',
+            apply: () => checkImports(packagePath + '/src'),
+        });
+    }
+    steps.push({
         name: 'Compiling ESM',
         apply: () => __awaiter(void 0, void 0, void 0, function* () {
             return compilePackageESM(packagePath);
         }),
     });
-    buildStep({
+    if (extensionlessImports) {
+        steps.push({
+            name: 'Rewriting ESM import specifiers',
+            apply: () => __awaiter(void 0, void 0, void 0, function* () {
+                const libEsm = path.join(packagePath, 'lib', 'esm');
+                if (!fs.existsSync(libEsm)) {
+                    return {
+                        error: "lib/esm was not emitted. 'linked.extensionlessImports' needs an ESM build: add tsconfig-esm.json to the package.",
+                    };
+                }
+                const { unresolved } = yield rewriteExtensionlessImports(libEsm);
+                if (unresolved.length > 0) {
+                    return `could not resolve ${unresolved.length} import(s), left unchanged: ${unresolved.join(', ')}`;
+                }
+                return true;
+            }),
+        });
+    }
+    steps.push({
         name: 'Compiling CJS',
         apply: () => __awaiter(void 0, void 0, void 0, function* () {
             return compilePackageCJS(packagePath);
         }),
     });
-    buildStep({
+    steps.push({
         name: 'Copying files to lib folder',
         apply: () => __awaiter(void 0, void 0, void 0, function* () {
             const files = yield glob(packagePath + '/src/**/*.{json,d.ts,css,scss}');
@@ -2299,7 +2401,7 @@ export const buildPackage = (target_1, target2_1, ...args_1) => __awaiter(void 0
             });
         }),
     });
-    buildStep({
+    steps.push({
         name: 'Dual package support',
         apply: () => {
             // Skip if no tsconfig files (e.g. pure-CSS packages).
@@ -2314,56 +2416,18 @@ export const buildPackage = (target_1, target2_1, ...args_1) => __awaiter(void 0
             });
         },
     });
-    buildStep({
+    steps.push({
         name: 'Removing old files from lib folder',
         apply: () => __awaiter(void 0, void 0, void 0, function* () {
             return removeOldFiles(packagePath);
         }),
     });
-    buildStep({
+    steps.push({
         name: 'Checking dependencies',
         apply: () => depCheck(packagePath),
     });
-    let success = yield buildProcess.catch((err) => {
-        let msg = typeof err === 'string' || err instanceof Error
-            ? err.toString()
-            : err.error && !err.error.toString().includes('Command failed:')
-                ? err.error
-                : err.stdout + '\n' + err.stderr;
-        if (logResults) {
-            spinner.stopAndPersist({
-                symbol: chalk.red('✖'),
-                // text: 'Build failed',
-            });
-        }
-        else {
-            console.error(chalk.red(packagePath.split('/').pop(), ' - Build failed:'));
-            console.error(err);
-            return msg;
-        }
-        console.log(msg);
-    });
-    //will be undefined if there was an error
-    if (typeof success !== 'undefined' && success !== false) {
-        if (logResults) {
-            spinner.stopAndPersist({
-                symbol: chalk.greenBright('✔'),
-                text: success === true
-                    ? 'Build successful'
-                    : 'Build successful with warnings',
-            });
-        }
-    }
-    else {
-        if (logResults) {
-            spinner.stopAndPersist({
-                symbol: chalk.red('✖'),
-                text: 'Build failed',
-            });
-        }
-    }
-    return success;
-});
+    return steps;
+};
 export const compilePackage = (...args_1) => __awaiter(void 0, [...args_1], void 0, function* (packagePath = process.cwd()) {
     //echo 'compiling CJS' && tsc -p tsconfig-cjs.json && echo 'compiling ESM' && tsc -p tsconfig-esm.json
     // let cjsConfig = fs.existsSync(path.join(packagePath,'tsconfig-cjs.json'));