@plasmicapp/cli 0.1.181 → 0.1.184

package/dist/actions/sync-components.js

@@ -42,7 +42,8 @@ const updateDirectSkeleton = (newFileContent, editedFileContent, context, compCo
                 throw e;
             }
             else {
-                throw new error_1.HandledError(e.messag);
+                lang_utils_1.assert(e instanceof Error);
+                throw new error_1.HandledError(e.message);
             }
         }
     })), () => { }, appendJsxOnMissingBase);
@@ -170,7 +171,7 @@ function syncProjectComponents(context, project, version, componentBundles, forc
                 }
                 if (isPage &&
                     config_utils_1.isPageAwarePlatform(context.config.platform) &&
-                    skeletonPath !== compConfig.importSpec.modulePath &&
+                    !file_utils_1.eqPagePath(skeletonPath, compConfig.importSpec.modulePath) &&
                     file_utils_1.fileExists(context, compConfig.importSpec.modulePath)) {
                     if (context.cliArgs.quiet !== true) {
                         deps_1.logger.info(`Renaming page file: ${compConfig.importSpec.modulePath} -> ${skeletonPath}\t['${project.projectName}' ${project.projectId}/${id} ${project.version}]`);

package/dist/utils/code-utils.js

@@ -252,7 +252,7 @@ function replaceImports(context, code, fromPath, fixImportContext, removeImportD
             const meta = fixImportContext.codeComponentMetas[uuid];
             if (meta.componentImportPath[0] === ".") {
                 // Relative path from the project root
-                const toPath = upath_1.default.join(process.cwd(), meta.componentImportPath);
+                const toPath = upath_1.default.join(context.rootDir, meta.componentImportPath);
                 lang_utils_1.assert(upath_1.default.isAbsolute(toPath));
                 const realPath = makeImportPath(context, fromPath, toPath, true, true);
                 stmt.source.value = realPath;

package/dist/utils/file-utils.d.ts

@@ -9,6 +9,16 @@ export declare function writeFileContentRaw(filePath: string, content: string |
 export declare function defaultResourcePath(context: PlasmicContext, project: ProjectConfig | ProjectMetaBundle | string, ...subpaths: string[]): string;
 export declare function defaultPublicResourcePath(context: PlasmicContext, project: ProjectConfig, ...subpaths: string[]): string;
 export declare function defaultPagePath(context: PlasmicContext, fileName: string): string;
+/**
+ * Returns true iff paths `a` and `b` resolve to the same page URI. For
+ * example:
+ *
+ * - pages/about.tsx and pages/about.js resolve to the same URI (/about).
+ * - pages/about/index.tsx and pages/about.tsx resolve to the same URI (/about).
+ * - pages/index.tsx and pages/index/index.tsx do not resolve to the same URI
+ * (they resolve, respectively, to / and /index).
+ */
+export declare function eqPagePath(a: string, b: string): boolean;
 export declare function writeFileContent(context: PlasmicContext, srcDirFilePath: string, content: string | Buffer, opts?: {
     force?: boolean;
 }): Promise<void>;

package/dist/utils/file-utils.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.existsBuffered = exports.deleteFileBuffered = exports.renameFileBuffered = exports.readFileText = exports.writeFileText = exports.withBufferedFs = exports.assertAllPathsInRootDir = exports.findFile = exports.findSrcDirPath = exports.buildBaseNameToFiles = exports.renameFile = exports.makeFilePath = exports.fileExists = exports.deleteFile = exports.readFileContent = exports.writeFileContent = exports.defaultPagePath = exports.defaultPublicResourcePath = exports.defaultResourcePath = exports.writeFileContentRaw = exports.stripExtension = void 0;
+exports.existsBuffered = exports.deleteFileBuffered = exports.renameFileBuffered = exports.readFileText = exports.writeFileText = exports.withBufferedFs = exports.assertAllPathsInRootDir = exports.findFile = exports.findSrcDirPath = exports.buildBaseNameToFiles = exports.renameFile = exports.makeFilePath = exports.fileExists = exports.deleteFile = exports.readFileContent = exports.writeFileContent = exports.eqPagePath = exports.defaultPagePath = exports.defaultPublicResourcePath = exports.defaultResourcePath = exports.writeFileContentRaw = exports.stripExtension = void 0;
 const fs_1 = __importDefault(require("fs"));
 const glob_1 = __importDefault(require("glob"));
 const lodash_1 = __importDefault(require("lodash"));
@@ -23,9 +23,10 @@ const code_utils_1 = require("./code-utils");
 const config_utils_1 = require("./config-utils");
 const lang_utils_1 = require("./lang-utils");
 const user_utils_1 = require("./user-utils");
+const findExtension = (filename) => { var _a; return (_a = filename === null || filename === void 0 ? void 0 : filename.substring(filename.indexOf("."))) !== null && _a !== void 0 ? _a : filename; };
 function stripExtension(filename, removeComposedPath = false) {
     const ext = removeComposedPath
-        ? filename.substring(filename.indexOf("."))
+        ? findExtension(lodash_1.default.last(filename.split("/")))
         : upath_1.default.extname(filename);
     if (!ext || filename === ext) {
         return filename;
@@ -67,6 +68,34 @@ function defaultPagePath(context, fileName) {
     return fileName;
 }
 exports.defaultPagePath = defaultPagePath;
+/**
+ * Returns true iff paths `a` and `b` resolve to the same page URI. For
+ * example:
+ *
+ * - pages/about.tsx and pages/about.js resolve to the same URI (/about).
+ * - pages/about/index.tsx and pages/about.tsx resolve to the same URI (/about).
+ * - pages/index.tsx and pages/index/index.tsx do not resolve to the same URI
+ * (they resolve, respectively, to / and /index).
+ */
+function eqPagePath(a, b) {
+    // Remove extension and ensure that a.length < b.length.
+    a = stripExtension(a);
+    b = stripExtension(b);
+    if (a.length > b.length) {
+        [a, b] = [b, a];
+    }
+    // pages/about.tsx and pages/about.js resolve to the same page URI.
+    if (a === b) {
+        return true;
+    }
+    // pages/about.* and pages/about/index.* resolve to the same URI, but
+    // pages/index.* and pages/index/index.* do not.
+    if (!a.endsWith("/index") && `${a}/index` === b) {
+        return true;
+    }
+    return false;
+}
+exports.eqPagePath = eqPagePath;
 function writeFileContent(context, srcDirFilePath, content, opts = {}) {
     return __awaiter(this, void 0, void 0, function* () {
         const path = makeFilePath(context, srcDirFilePath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plasmicapp/cli",
-  "version": "0.1.181",
+  "version": "0.1.184",
   "description": "plasmic cli for syncing local code with Plasmic designs",
   "engines": {
     "node": ">=12"

package/src/actions/sync-components.ts

@@ -21,6 +21,7 @@ import {
   defaultPagePath,
   defaultResourcePath,
   deleteFile,
+  eqPagePath,
   fileExists,
   readFileContent,
   renameFile,
@@ -71,7 +72,8 @@ const updateDirectSkeleton = async (
         ) {
           throw e;
         } else {
-          throw new HandledError(e.messag);
+          assert(e instanceof Error);
+          throw new HandledError(e.message);
         }
       }
     }),
@@ -302,7 +304,7 @@ export async function syncProjectComponents(
       if (
         isPage &&
         isPageAwarePlatform(context.config.platform) &&
-        skeletonPath !== compConfig.importSpec.modulePath &&
+        !eqPagePath(skeletonPath, compConfig.importSpec.modulePath) &&
         fileExists(context, compConfig.importSpec.modulePath)
       ) {
         if (context.cliArgs.quiet !== true) {

package/src/utils/code-utils.ts

@@ -330,7 +330,7 @@ export function replaceImports(
       const meta = fixImportContext.codeComponentMetas[uuid];
       if (meta.componentImportPath[0] === ".") {
         // Relative path from the project root
-        const toPath = path.join(process.cwd(), meta.componentImportPath);
+        const toPath = path.join(context.rootDir, meta.componentImportPath);
         assert(path.isAbsolute(toPath));
         const realPath = makeImportPath(context, fromPath, toPath, true, true);
         stmt.source.value = realPath;

package/src/utils/file-utils.ts

@@ -15,9 +15,12 @@ import {
 import { ensureString } from "./lang-utils";
 import { confirmWithUser } from "./user-utils";
 
+const findExtension = (filename?: string) =>
+  filename?.substring(filename.indexOf(".")) ?? filename;
+
 export function stripExtension(filename: string, removeComposedPath = false) {
   const ext = removeComposedPath
-    ? filename.substring(filename.indexOf("."))
+    ? findExtension(L.last(filename.split("/")))
     : path.extname(filename);
   if (!ext || filename === ext) {
     return filename;
@@ -84,6 +87,37 @@ export function defaultPagePath(context: PlasmicContext, fileName: string) {
   return fileName;
 }
 
+/**
+ * Returns true iff paths `a` and `b` resolve to the same page URI. For
+ * example:
+ *
+ * - pages/about.tsx and pages/about.js resolve to the same URI (/about).
+ * - pages/about/index.tsx and pages/about.tsx resolve to the same URI (/about).
+ * - pages/index.tsx and pages/index/index.tsx do not resolve to the same URI
+ * (they resolve, respectively, to / and /index).
+ */
+export function eqPagePath(a: string, b: string) {
+  // Remove extension and ensure that a.length < b.length.
+  a = stripExtension(a);
+  b = stripExtension(b);
+  if (a.length > b.length) {
+    [a, b] = [b, a];
+  }
+
+  // pages/about.tsx and pages/about.js resolve to the same page URI.
+  if (a === b) {
+    return true;
+  }
+
+  // pages/about.* and pages/about/index.* resolve to the same URI, but
+  // pages/index.* and pages/index/index.* do not.
+  if (!a.endsWith("/index") && `${a}/index` === b) {
+    return true;
+  }
+
+  return false;
+}
+
 export async function writeFileContent(
   context: PlasmicContext,
   srcDirFilePath: string,