@intelligentgraphics/ig.gfx.packager 2.1.2 → 2.1.3

package/build/index.js

@@ -3847,21 +3847,14 @@ const PLUGIN_ID = "0feba3a0-b6d1-11e6-9598-0800200c9a66";
 const PACKAGE_FILE = "_Package.json";
 const INDEX_FILE = "_Index.json";
 const ANIMATION_FILE = ".animation.json";
-var Mode;
-
-(function (Mode) {
-  Mode[Mode["Standard"] = 0] = "Standard";
-  Mode[Mode["IG_GFX"] = 1] = "IG_GFX";
-})(Mode || (Mode = {}));
-
 let validateSchema;
 const runtimeScripts = ["Interactor", "Core", "Mixed"];
 const notRuntimeScripts = ["Context", "Evaluator"];
 
 const executePackager = async options => {
-  const logStep = step => (0, _util2.logPackageMessage)(`${options.domain}.${options.subdomain}`, step);
+  const logStep = step => (0, _util2.logPackageMessage)(options.data.Package, step);
 
-  const packageName = `${options.domain}.${options.subdomain}_${options.version}`;
+  const packageName = `${options.data.Package}_${options.version}`;
   const binDir = path.join(options.cwd, "bin");
   fs.ensureDirSync(binDir);
   const zipFilePath = path.join(binDir, packageName + ".zip");
@@ -3884,7 +3877,8 @@ const buildArchive = async ({
   domain,
   subdomain,
   cwd,
-  folderPath
+  folderPath,
+  data
 }, zipFilePath, logStep) => {
   if (validateSchema === undefined) {
     validateSchema = await _axios.default.get("https://archive.intelligentgraphics.biz/schemas/gfx/animation.json").then(({
@@ -3898,41 +3892,14 @@ const buildArchive = async ({
     }).compile(data));
   }
 
-  let mode = Mode.Standard;
-
-  if (domain === "IG") {
-    switch (subdomain) {
-      case "GFX.Standard":
-      case "GFX.Furniture":
-        mode = Mode.IG_GFX;
-        console.log("Special Mode: IG.GFX");
-        break;
-    }
-  }
-
   const scriptDirectories = [];
   let primaryScriptDir;
   const libFilePath = path.join(cwd, "bin", `${domain}.${subdomain}.min.js`);
 
-  switch (mode) {
-    case Mode.IG_GFX:
-      const dir = subdomain.substr(4);
-      scriptDirectories.push(path.join(cwd, "src", dir));
-
-      if (dir === "Standard") {
-        scriptDirectories.push(path.join(cwd, "src", dir, "images"));
-      }
-
-      break;
-
-    default:
-      if (fs.existsSync(path.join(folderPath, "Scripts"))) {
-        scriptDirectories.push(path.join(folderPath, "Scripts"));
-      } else {
-        scriptDirectories.push(folderPath);
-      }
-
-      break;
+  if (fs.existsSync(path.join(folderPath, "Scripts"))) {
+    scriptDirectories.push(path.join(folderPath, "Scripts"));
+  } else {
+    scriptDirectories.push(folderPath);
   }
 
   try {
@@ -3942,6 +3909,11 @@ const buildArchive = async ({
     throw new Error(`Expected scripts directory "${scriptDirectories[0]}" to exist`);
   }
 
+  if (subdomain === "GFX.Standard") {
+    logStep(`Including Images folder`);
+    scriptDirectories.push(path.join(folderPath, "Images"));
+  }
+
   const manifest = _igTools.FileUtil.readJsonFile(path.join(primaryScriptDir, PACKAGE_FILE));
 
   if (manifest !== undefined) {
@@ -4005,22 +3977,19 @@ Packaging without a javascript file is only allowed when animation json files ar
 		* Copyright (C) ${date.getFullYear()} intelligentgraphics. All Rights Reserved. */`;
   }
 
-  if (!library.includes(`${domain}.${subdomain}`)) {
-    library += `
-			var ${domain};
-			(function (${domain}) {
-				var ${subdomain};
-				(function (${subdomain}) {
-				})(${subdomain} = ${domain}.${subdomain} || (${domain}.${subdomain} = {}));
-			})(${domain} || (${domain} = {}));
-		`;
-  }
-
   if (animations.size > 0) {
-    let scope = `${domain}.${subdomain}`;
-
-    if (mode === Mode.IG_GFX) {
-      scope = "IGX.Std";
+    const [scriptDomain, scriptSubdomain] = data.Scope.split(".");
+    const scope = `${scriptDomain}.${scriptSubdomain}`;
+
+    if (!library.includes(scope)) {
+      library += `
+				var ${scriptDomain};
+				(function (${scriptDomain}) {
+					var ${scriptSubdomain};
+					(function (${scriptSubdomain}) {
+					})(${scriptSubdomain} = ${scriptDomain}.${scriptSubdomain} || (${scriptDomain}.${scriptSubdomain} = {}));
+				})(${scriptDomain} || (${scriptDomain} = {}));
+			`;
     }
 
     for (const [name, data] of animations) {
@@ -4032,7 +4001,7 @@ Packaging without a javascript file is only allowed when animation json files ar
   const minifyResult = terser.minify(library, {
     ecma: 5
   });
-  archive.file(`${domain}.${subdomain}.js`, minifyResult.code);
+  archive.file(`${data.Package}.js`, minifyResult.code);
 
   for (const directory of scriptDirectories) {
     try {
@@ -7987,7 +7956,7 @@ module.exports = require("util");
 /***/ ((module) => {
 
 "use strict";
-module.exports = JSON.parse('{"name":"@intelligentgraphics/ig.gfx.packager","version":"2.1.2","description":"IG.GFX.Packager 2.1.2 (2.1.2.100)","main":"build/index.js","private":false,"publishConfig":{"access":"public"},"bin":{"packager":"./build/index.js"},"files":["build","locales","scripts"],"scripts":{"dist":"webpack","clean":"rimraf build *.tsbuildinfo","prepublishOnly":"yarn clean && yarn dist","test":"jest","_postinstall":"node scripts/postinstall.js"},"author":"Michael Beier <mb@intelligentgraphics.biz>","dependencies":{"ajv":"^8.6.2","axios":"^0.21.1","core-js":"^3.16.0","execa":"^5.1.1","fs-extra":"^10.0.0","glob":"^7.1.4","jszip":"^3.10.0","rimraf":"^3.0.2","source-map-support":"^0.5.19","terser":"^4.8.0","typedoc":"~0.22.15","typescript":"~4.6.3","update-notifier":"^5.1.0","v8-compile-cache":"^2.1.1","y18n":"^5.0.8","yargs":"^17.0.1"},"devDependencies":{"@babel/plugin-proposal-class-properties":"^7.14.5","@babel/plugin-proposal-object-rest-spread":"^7.14.7","@babel/preset-env":"^7.14.9","@intelligentgraphics/ig.tools.core":"^1.5.1","@intelligentgraphics/ig.utilities":"^1.6.6","@types/archiver":"^5.1.1","@types/fs-extra":"^9.0.12","@types/glob":"^7.1.4","@types/node":"^16.4.11","@types/rimraf":"^3.0.1","@types/update-notifier":"^5.1.0","@types/yargs":"^17.0.2","babel-loader":"^8.1.0","jest":"^28.1.1","ts-jest":"^28.0.5","ts-loader":"^9.2.5","ts-node":"^10.1.0","webpack":"^5.64.4","webpack-cli":"^4.7.2"},"jest":{"transform":{"\\\\.tsx?$":"ts-jest"},"testRegex":"(.*\\\\.(test))\\\\.(ts|tsx)$","moduleFileExtensions":["ts","tsx","js","json"],"moduleNameMapper":{"^~/(.*)":"<rootDir>/src/$1"},"testEnvironmentOptions":{"url":"http://localhost/"}}}');
+module.exports = JSON.parse('{"name":"@intelligentgraphics/ig.gfx.packager","version":"2.1.3","description":"IG.GFX.Packager 2.1.3 (2.1.3.100)","main":"build/index.js","private":false,"publishConfig":{"access":"public"},"bin":{"packager":"./build/index.js"},"files":["build","locales","scripts"],"scripts":{"dist":"webpack","clean":"rimraf build *.tsbuildinfo","prepublishOnly":"yarn clean && yarn dist","test":"jest","_postinstall":"node scripts/postinstall.js"},"author":"Michael Beier <mb@intelligentgraphics.biz>","dependencies":{"ajv":"^8.6.2","axios":"^0.21.1","core-js":"^3.16.0","execa":"^5.1.1","fs-extra":"^10.0.0","glob":"^7.1.4","jszip":"^3.10.0","rimraf":"^3.0.2","source-map-support":"^0.5.19","terser":"^4.8.0","typedoc":"~0.22.15","typescript":"~4.6.3","update-notifier":"^5.1.0","v8-compile-cache":"^2.1.1","y18n":"^5.0.8","yargs":"^17.0.1"},"devDependencies":{"@babel/plugin-proposal-class-properties":"^7.14.5","@babel/plugin-proposal-object-rest-spread":"^7.14.7","@babel/preset-env":"^7.14.9","@intelligentgraphics/ig.tools.core":"^1.5.1","@intelligentgraphics/ig.utilities":"^1.6.6","@types/archiver":"^5.1.1","@types/fs-extra":"^9.0.12","@types/glob":"^7.1.4","@types/node":"^16.4.11","@types/rimraf":"^3.0.1","@types/update-notifier":"^5.1.0","@types/yargs":"^17.0.2","babel-loader":"^8.1.0","jest":"^28.1.1","ts-jest":"^28.0.5","ts-loader":"^9.2.5","ts-node":"^10.1.0","webpack":"^5.64.4","webpack-cli":"^4.7.2"},"jest":{"transform":{"\\\\.tsx?$":"ts-jest"},"testRegex":"(.*\\\\.(test))\\\\.(ts|tsx)$","moduleFileExtensions":["ts","tsx","js","json"],"moduleNameMapper":{"^~/(.*)":"<rootDir>/src/$1"},"testEnvironmentOptions":{"url":"http://localhost/"}}}');
 
 /***/ })