codeplay-common 3.1.7 → 3.1.8

package/files/buildCodeplay/codeplayBeforeBuild-6.0.js

@@ -327,13 +327,16 @@ checkAppUniqueId();
 
 const jsDir = path.join(__dirname, "..", "src", "js");
 
-// ✅ OLD structure check
+// 🔍 Detect OLD structure
 const oldEditorDirs = fs.readdirSync(jsDir)
   .filter(name => /^editor-\d+\.\d+$/.test(name));
 
-// ✅ NEW structure path
+// 📁 New structure path (optional, not mandatory)
 const newEditorBaseDir = path.join(jsDir, "editor");
 
+// ======================================================
+// ❌ CASE 1: OLD STRUCTURE FOUND → STOP
+// ======================================================
 if (oldEditorDirs.length > 0) {
 
   console.error(`
@@ -342,127 +345,98 @@ if (oldEditorDirs.length > 0) {
 You are using outdated folder structure:
   src/js/editor-x.x/
 
-🚨 This structure is no longer supported.
+🚨 This is no longer supported.
 
-✅ NEW STRUCTURE REQUIRED:
-  src/js/editor/editor-x.x/
-
-📦 Your existing folders:
+📦 Found folders:
 ${oldEditorDirs.map(d => "  - " + d).join("\n")}
 
-👉 Please move them manually like this:
+👉 Please move them manually:
 
   src/js/editor-1.6
-      ⬇ MOVE TO
+      ⬇
   src/js/editor/editor-1.6
 
-⚠️ After moving, re-run the build.
+⚠️ Also ensure:
+  src/js/editor/configuration.json exists
 
-❌ Build stopped to prevent runtime errors.
+❌ Build stopped.
 `);
 
   process.exit(1);
 }
 
-// ✅ Ensure new structure exists
-if (!fs.existsSync(newEditorBaseDir)) {
-
-  console.error(`
-❌ MISSING EDITOR DIRECTORY
-
-Expected path:
-  src/js/editor/
-
-But it was not found.
-
-👉 Please create the folder and move editor-x.x inside it.
-
-Example:
-  src/js/editor/editor-1.6/
-`);
-
-  process.exit(1);
-}
+// ======================================================
+// ✅ CASE 2: NEW STRUCTURE EXISTS → VALIDATE
+// ======================================================
+if (fs.existsSync(newEditorBaseDir)) {
 
+  // 🔍 Find editor-x.x inside new folder
+  const editorDirs = fs.readdirSync(newEditorBaseDir)
+    .filter(name => /^editor-\d+\.\d+$/.test(name));
 
+  // 👉 If editor folder exists but no versions → skip safely
+  if (editorDirs.length === 0) {
+    console.log("ℹ️ No editor-x.x folders found inside src/js/editor/");
+    return;
+  }
 
-// ======================================================
-// Validate editor configuration structure
-// ======================================================
+  // ======================================================
+  // ✅ Validate configuration.json (NEW RULE)
+  // ======================================================
 
-const editorConfigPath = path.join(newEditorBaseDir, "configuration.json");
+  const editorConfigPath = path.join(newEditorBaseDir, "configuration.json");
 
-// ❌ Check if configuration.json exists in correct place
-if (!fs.existsSync(editorConfigPath)) {
-  console.error(`
+  // ❌ Missing config
+  if (!fs.existsSync(editorConfigPath)) {
+    console.error(`
 ❌ MISSING EDITOR CONFIGURATION FILE
 
-Required file not found:
+Required:
   src/js/editor/configuration.json
 
-👉 This file is mandatory in new editor structure.
-
-📦 Please ensure:
-  src/js/editor/configuration.json exists
-
 ❌ Build stopped.
 `);
-  process.exit(1);
-}
-
-// ❌ Check for OLD structure mistake inside version folders
-const invalidConfigLocations = [];
-
-const editorSubDirs = fs.readdirSync(newEditorBaseDir)
-  .filter(name => /^editor-\d+\.\d+$/.test(name));
+    process.exit(1);
+  }
 
-editorSubDirs.forEach(dir => {
-  const wrongPath = path.join(newEditorBaseDir, dir, "configuration.json");
+  // ❌ Check wrong placement
+  const invalidConfigs = [];
 
-  if (fs.existsSync(wrongPath)) {
-    invalidConfigLocations.push(`src/js/editor/${dir}/configuration.json`);
-  }
-});
+  editorDirs.forEach(dir => {
+    const wrongPath = path.join(newEditorBaseDir, dir, "configuration.json");
+    if (fs.existsSync(wrongPath)) {
+      invalidConfigs.push(`src/js/editor/${dir}/configuration.json`);
+    }
+  });
 
-if (invalidConfigLocations.length > 0) {
-  console.error(`
-❌ INVALID EDITOR CONFIGURATION STRUCTURE DETECTED
+  if (invalidConfigs.length > 0) {
+    console.error(`
+❌ INVALID CONFIGURATION LOCATION
 
 🚫 configuration.json must NOT be inside version folders.
 
-Found invalid files:
-${invalidConfigLocations.map(p => "  - " + p).join("\n")}
+Found:
+${invalidConfigs.map(p => "  - " + p).join("\n")}
 
-✅ Correct structure:
+✅ Correct:
   src/js/editor/configuration.json
 
-👉 Please MOVE or DELETE the above files.
-
 ❌ Build stopped.
 `);
-  process.exit(1);
-}
-
-console.log("✅ Editor configuration structure validated.");
-
+    process.exit(1);
+  }
 
+  console.log("✅ Editor structure validated.");
 
+  // ======================================================
+  // 🚀 Continue execution (run.js)
+  // ======================================================
 
-// ✅ Now use new structure
-const editorDirs = fs.readdirSync(newEditorBaseDir)
-  .filter(name => /^editor-\d+\.\d+$/.test(name))
-  .sort((a, b) => {
-    const getVersion = str => str.match(/(\d+)\.(\d+)/).slice(1).map(Number);
-    const [aMajor, aMinor] = getVersion(a);
-    const [bMajor, bMinor] = getVersion(b);
-    return bMajor - aMajor || bMinor - aMinor;
-  });
-
-if (editorDirs.length === 0) {
-  console.log("@Codemirror editor(s) not found inside src/js/editor/");
-} else {
-
-  const latestEditorDir = editorDirs[0];
+  const latestEditorDir = editorDirs.sort((a, b) => {
+    const vA = parseFloat(a.split('-')[1]);
+    const vB = parseFloat(b.split('-')[1]);
+    return vB - vA;
+  })[0];
 
   const runJsPath = path.join(newEditorBaseDir, latestEditorDir, "run.js");
 
@@ -475,6 +449,13 @@ if (editorDirs.length === 0) {
   execSync(`node "${runJsPath}"`, { stdio: "inherit" });
 }
 
+// ======================================================
+// ✅ CASE 3: NOTHING EXISTS → DO NOTHING
+// ======================================================
+else {
+  console.log("ℹ️ Editor not used in this project. Skipping...");
+}
+
 //@Codemirror check and install/uninstall the packages END
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codeplay-common",
-  "version": "3.1.7",
+  "version": "3.1.8",
   "description": "Common build scripts and files",
   "scripts": {
 	"postinstall": "node scripts/sync-files.js",