@intelligentgraphics/ig.gfx.packager 2.0.9 → 2.1.1

package/build/index.js

@@ -3416,7 +3416,6 @@ const releaseFolder = async (folderPath, options) => {
   var _options$domain, _options$subdomain;
 
   const {
-    version,
     write: writeVersionFile,
     reset: resetVersionFile
   } = getVersionFile(folderPath);
@@ -3436,21 +3435,30 @@ const releaseFolder = async (folderPath, options) => {
     throw new Error(`Please enter a version in this format 1.0.0.100`);
   }
 
-  const newVersionString = newVersion.toVersionString({
-    buildNumber: true
-  });
+  if (newVersion.buildNumber < 100) {
+    newVersion.preRelease = {
+      type: "beta",
+      version: newVersion.buildNumber
+    };
+  } else if (newVersion.buildNumber > 100) {
+    newVersion.preRelease = {
+      type: "patch",
+      version: newVersion.buildNumber - 100
+    };
+  }
 
   if (!options.pushOnly) {
-    if (!options.noValidate && version !== undefined && version.buildNumber >= 100 && !newVersion.isGreaterThan(version)) {
-      throw new Error(`Release versions with a build number > 100 may not be overwritten. Please increase the version.`);
-    }
-
     writeVersionFile(fullPackageName, newVersion);
     await (0, _build.buildFolders)(_objectSpread(_objectSpread({}, options), {}, {
       directories: [folderPath]
     }));
   }
 
+  newVersion.preRelease = undefined;
+  const newVersionString = newVersion.toVersionString({
+    buildNumber: true
+  });
+
   try {
     await (0, _packager.executePackager)({
       data: packageDescription,
@@ -3520,7 +3528,9 @@ const getVersionFile = folder => {
   });
 
   const createVersionFileWriter = (copyright = [currentYear], copyrightStuff = "") => (name, newVersion) => {
-    const result = `console.log("${newVersion.toDescriptionString(name)}. Copyright (C) ${createYearString(copyright)}${copyrightStuff}");`;
+    const descriptionText = newVersion.toDescriptionString(name);
+    const copyrightText = createYearString(copyright);
+    const result = `console.log("${descriptionText}. Copyright (C) ${copyrightText}${copyrightStuff}");`;
 
     _igTools.FileUtil.writeFile(filePath, result);
   };
@@ -3748,6 +3758,12 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 const PLUGIN_ID = "0feba3a0-b6d1-11e6-9598-0800200c9a66";
 const PACKAGE_FILE = "_Package.json";
 const INDEX_FILE = "_Index.json";
@@ -3760,6 +3776,8 @@ var Mode;
 })(Mode || (Mode = {}));
 
 let validateSchema;
+const runtimeScripts = ["Interactor", "Core", "Mixed"];
+const notRuntimeScripts = ["Context", "Evaluator"];
 
 const executePackager = async options => {
   const logStep = step => (0, _util.logPackageMessage)(`${options.domain}.${options.subdomain}`, step);
@@ -3796,7 +3814,8 @@ const buildArchive = async ({
       coerceTypes: true,
       allErrors: true,
       removeAdditional: true,
-      useDefaults: "empty"
+      useDefaults: "empty",
+      validateSchema: "log"
     }).compile(data));
   }
 
@@ -3842,9 +3861,25 @@ const buildArchive = async ({
     primaryScriptDir = scriptDirectories[0];
   } catch (err) {
     throw new Error(`Expected scripts directory "${scriptDirectories[0]}" to exist`);
-  } // const indexFile = path.join(primaryScriptDir, INDEX_FILE);
-  // const index = FileUtil.readJsonFile<object>(indexFile);
-  // if (index === undefined) {
+  }
+
+  const manifest = _igTools.FileUtil.readJsonFile(path.join(primaryScriptDir, PACKAGE_FILE));
+
+  if (manifest !== undefined) {
+    if (manifest.RunTime && notRuntimeScripts.includes(manifest.Type)) {
+      logStep("Setting script RunTime to false because of script type");
+
+      _igTools.FileUtil.writeFile(path.join(primaryScriptDir, PACKAGE_FILE), JSON.stringify(_objectSpread(_objectSpread({}, manifest), {}, {
+        RunTime: false
+      }), undefined, "\t") + "\n");
+    } else if (!manifest.RunTime && runtimeScripts.includes(manifest.Type)) {
+      logStep("Setting script RunTime to true because of script type");
+
+      _igTools.FileUtil.writeFile(path.join(primaryScriptDir, PACKAGE_FILE), JSON.stringify(_objectSpread(_objectSpread({}, manifest), {}, {
+        RunTime: true
+      }), undefined, "\t") + "\n");
+    }
+  } // if (index === undefined) {
   // 	throw new Error(
   // 		`Could not find an "${INDEX_FILE}" file in "${primaryScriptDir}"`,
   // 	);
@@ -3861,13 +3896,7 @@ const buildArchive = async ({
     const content = _igTools.FileUtil.readFile(path.join(primaryScriptDir, scriptFile));
 
     const data = JSON.parse(content);
-    const valid = validateSchema(data);
-
-    if (!valid) {
-      console.log(`Ignoring animation "${scriptFile}", because it's not valid`);
-      continue;
-    }
-
+    validateSchema(data);
     animations.set(data.Id, JSON.stringify(data));
   }
 
@@ -4119,7 +4148,9 @@ const loadDataFromFolder = folder => {
 
   data = {
     Package: data.Package,
-    Scope: data.Scope || data.Package
+    Scope: data.Scope || data.Package,
+    RunTime: data.RunTime,
+    Type: data.Type
   };
 
   if (packageJSON !== undefined) {
@@ -4145,7 +4176,7 @@ exports.loadDataFromFolder = loadDataFromFolder;
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.build = void 0;
+exports.tryReadTsConfig = exports.build = void 0;
 
 __webpack_require__(/*! core-js/modules/es.promise.js */ "../../node_modules/core-js/modules/es.promise.js");
 
@@ -4169,7 +4200,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-const build = async (folderPath, options) => {
+const tryReadTsConfig = folderPath => {
   const {
     config
   } = ts.readConfigFile(path.join(folderPath, "tsconfig.json"), path => {
@@ -4179,6 +4210,13 @@ const build = async (folderPath, options) => {
       return undefined;
     }
   });
+  return config;
+};
+
+exports.tryReadTsConfig = tryReadTsConfig;
+
+const build = async (folderPath, options) => {
+  const config = tryReadTsConfig(folderPath);
   config.compilerOptions.lib = ["es5", "dom"];
   const result = ts.convertCompilerOptionsFromJson(config.compilerOptions, folderPath);
 
@@ -4906,7 +4944,7 @@ module.exports = [
 /***/ ((module, __unused_webpack_exports, __webpack_require__) => {
 
 var global = __webpack_require__(/*! ../internals/global */ "../../node_modules/core-js/internals/global.js");
-var getOwnPropertyDescriptor = __webpack_require__(/*! ../internals/object-get-own-property-descriptor */ "../../node_modules/core-js/internals/object-get-own-property-descriptor.js").f;
+var getOwnPropertyDescriptor = (__webpack_require__(/*! ../internals/object-get-own-property-descriptor */ "../../node_modules/core-js/internals/object-get-own-property-descriptor.js").f);
 var createNonEnumerableProperty = __webpack_require__(/*! ../internals/create-non-enumerable-property */ "../../node_modules/core-js/internals/create-non-enumerable-property.js");
 var redefine = __webpack_require__(/*! ../internals/redefine */ "../../node_modules/core-js/internals/redefine.js");
 var setGlobal = __webpack_require__(/*! ../internals/set-global */ "../../node_modules/core-js/internals/set-global.js");
@@ -5721,8 +5759,8 @@ module.exports = function (obj) {
 
 var global = __webpack_require__(/*! ../internals/global */ "../../node_modules/core-js/internals/global.js");
 var bind = __webpack_require__(/*! ../internals/function-bind-context */ "../../node_modules/core-js/internals/function-bind-context.js");
-var getOwnPropertyDescriptor = __webpack_require__(/*! ../internals/object-get-own-property-descriptor */ "../../node_modules/core-js/internals/object-get-own-property-descriptor.js").f;
-var macrotask = __webpack_require__(/*! ../internals/task */ "../../node_modules/core-js/internals/task.js").set;
+var getOwnPropertyDescriptor = (__webpack_require__(/*! ../internals/object-get-own-property-descriptor */ "../../node_modules/core-js/internals/object-get-own-property-descriptor.js").f);
+var macrotask = (__webpack_require__(/*! ../internals/task */ "../../node_modules/core-js/internals/task.js").set);
 var IS_IOS = __webpack_require__(/*! ../internals/engine-is-ios */ "../../node_modules/core-js/internals/engine-is-ios.js");
 var IS_IOS_PEBBLE = __webpack_require__(/*! ../internals/engine-is-ios-pebble */ "../../node_modules/core-js/internals/engine-is-ios-pebble.js");
 var IS_WEBOS_WEBKIT = __webpack_require__(/*! ../internals/engine-is-webos-webkit */ "../../node_modules/core-js/internals/engine-is-webos-webkit.js");
@@ -6011,7 +6049,7 @@ module.exports = uncurryThis({}.isPrototypeOf);
 var uncurryThis = __webpack_require__(/*! ../internals/function-uncurry-this */ "../../node_modules/core-js/internals/function-uncurry-this.js");
 var hasOwn = __webpack_require__(/*! ../internals/has-own-property */ "../../node_modules/core-js/internals/has-own-property.js");
 var toIndexedObject = __webpack_require__(/*! ../internals/to-indexed-object */ "../../node_modules/core-js/internals/to-indexed-object.js");
-var indexOf = __webpack_require__(/*! ../internals/array-includes */ "../../node_modules/core-js/internals/array-includes.js").indexOf;
+var indexOf = (__webpack_require__(/*! ../internals/array-includes */ "../../node_modules/core-js/internals/array-includes.js").indexOf);
 var hiddenKeys = __webpack_require__(/*! ../internals/hidden-keys */ "../../node_modules/core-js/internals/hidden-keys.js");
 
 var push = uncurryThis([].push);
@@ -6212,7 +6250,7 @@ var createNonEnumerableProperty = __webpack_require__(/*! ../internals/create-no
 var setGlobal = __webpack_require__(/*! ../internals/set-global */ "../../node_modules/core-js/internals/set-global.js");
 var inspectSource = __webpack_require__(/*! ../internals/inspect-source */ "../../node_modules/core-js/internals/inspect-source.js");
 var InternalStateModule = __webpack_require__(/*! ../internals/internal-state */ "../../node_modules/core-js/internals/internal-state.js");
-var CONFIGURABLE_FUNCTION_NAME = __webpack_require__(/*! ../internals/function-name */ "../../node_modules/core-js/internals/function-name.js").CONFIGURABLE;
+var CONFIGURABLE_FUNCTION_NAME = (__webpack_require__(/*! ../internals/function-name */ "../../node_modules/core-js/internals/function-name.js").CONFIGURABLE);
 
 var getInternalState = InternalStateModule.get;
 var enforceInternalState = InternalStateModule.enforce;
@@ -6333,7 +6371,7 @@ module.exports = function (CONSTRUCTOR_NAME) {
   \*****************************************************************/
 /***/ ((module, __unused_webpack_exports, __webpack_require__) => {
 
-var defineProperty = __webpack_require__(/*! ../internals/object-define-property */ "../../node_modules/core-js/internals/object-define-property.js").f;
+var defineProperty = (__webpack_require__(/*! ../internals/object-define-property */ "../../node_modules/core-js/internals/object-define-property.js").f);
 var hasOwn = __webpack_require__(/*! ../internals/has-own-property */ "../../node_modules/core-js/internals/has-own-property.js");
 var wellKnownSymbol = __webpack_require__(/*! ../internals/well-known-symbol */ "../../node_modules/core-js/internals/well-known-symbol.js");
 
@@ -6395,7 +6433,7 @@ var store = __webpack_require__(/*! ../internals/shared-store */ "../../node_mod
 (module.exports = function (key, value) {
   return store[key] || (store[key] = value !== undefined ? value : {});
 })('versions', []).push({
-  version: '3.19.1',
+  version: '3.19.3',
   mode: IS_PURE ? 'pure' : 'global',
   copyright: '© 2021 Denis Pushkarev (zloirock.ru)'
 });
@@ -6856,7 +6894,7 @@ var inspectSource = __webpack_require__(/*! ../internals/inspect-source */ "../.
 var iterate = __webpack_require__(/*! ../internals/iterate */ "../../node_modules/core-js/internals/iterate.js");
 var checkCorrectnessOfIteration = __webpack_require__(/*! ../internals/check-correctness-of-iteration */ "../../node_modules/core-js/internals/check-correctness-of-iteration.js");
 var speciesConstructor = __webpack_require__(/*! ../internals/species-constructor */ "../../node_modules/core-js/internals/species-constructor.js");
-var task = __webpack_require__(/*! ../internals/task */ "../../node_modules/core-js/internals/task.js").set;
+var task = (__webpack_require__(/*! ../internals/task */ "../../node_modules/core-js/internals/task.js").set);
 var microtask = __webpack_require__(/*! ../internals/microtask */ "../../node_modules/core-js/internals/microtask.js");
 var promiseResolve = __webpack_require__(/*! ../internals/promise-resolve */ "../../node_modules/core-js/internals/promise-resolve.js");
 var hostReportErrors = __webpack_require__(/*! ../internals/host-report-errors */ "../../node_modules/core-js/internals/host-report-errors.js");
@@ -6872,7 +6910,7 @@ var V8_VERSION = __webpack_require__(/*! ../internals/engine-v8-version */ "../.
 var SPECIES = wellKnownSymbol('species');
 var PROMISE = 'Promise';
 
-var getInternalState = InternalStateModule.get;
+var getInternalState = InternalStateModule.getterFor(PROMISE);
 var setInternalState = InternalStateModule.set;
 var getInternalPromiseState = InternalStateModule.getterFor(PROMISE);
 var NativePromisePrototype = NativePromise && NativePromise.prototype;
@@ -7256,7 +7294,7 @@ var hasOwn = __webpack_require__(/*! ../internals/has-own-property */ "../../nod
 var isCallable = __webpack_require__(/*! ../internals/is-callable */ "../../node_modules/core-js/internals/is-callable.js");
 var isPrototypeOf = __webpack_require__(/*! ../internals/object-is-prototype-of */ "../../node_modules/core-js/internals/object-is-prototype-of.js");
 var toString = __webpack_require__(/*! ../internals/to-string */ "../../node_modules/core-js/internals/to-string.js");
-var defineProperty = __webpack_require__(/*! ../internals/object-define-property */ "../../node_modules/core-js/internals/object-define-property.js").f;
+var defineProperty = (__webpack_require__(/*! ../internals/object-define-property */ "../../node_modules/core-js/internals/object-define-property.js").f);
 var copyConstructorProperties = __webpack_require__(/*! ../internals/copy-constructor-properties */ "../../node_modules/core-js/internals/copy-constructor-properties.js");
 
 var NativeSymbol = global.Symbol;
@@ -7546,7 +7584,7 @@ module.exports = require("util");
 /***/ ((module) => {
 
 "use strict";
-module.exports = JSON.parse('{"name":"@intelligentgraphics/ig.gfx.packager","version":"2.0.9","description":"IG.GFX.Packager 2.0.9 (2.0.9.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","_postinstall":"node scripts/postinstall.js"},"author":"Michael Beier <mb@intelligentgraphics.biz>","dependencies":{"ajv":"^8.6.2","archiver":"^5.0.0","axios":"^0.21.1","core-js":"^3.16.0","execa":"^5.1.1","fs-extra":"^10.0.0","glob":"^7.1.4","rimraf":"^3.0.2","source-map-support":"^0.5.19","terser":"^4.8.0","typedoc":"^0.21.5","typescript":"^4.3.5","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","ts-loader":"^9.2.5","ts-node":"^10.1.0","webpack":"^5.48.0","webpack-cli":"^4.7.2"}}');
+module.exports = JSON.parse('{"name":"@intelligentgraphics/ig.gfx.packager","version":"2.1.1","description":"IG.GFX.Packager 2.1.1 (2.1.1.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","_postinstall":"node scripts/postinstall.js"},"author":"Michael Beier <mb@intelligentgraphics.biz>","dependencies":{"ajv":"^8.6.2","archiver":"^5.0.0","axios":"^0.21.1","core-js":"^3.16.0","execa":"^5.1.1","fs-extra":"^10.0.0","glob":"^7.1.4","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","ts-loader":"^9.2.5","ts-node":"^10.1.0","webpack":"^5.64.4","webpack-cli":"^4.7.2"}}');
 
 /***/ })
 
@@ -7621,7 +7659,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
-__webpack_require__(/*! source-map-support */ "source-map-support").install();
+(__webpack_require__(/*! source-map-support */ "source-map-support").install)();
 
 const pjson = __webpack_require__(/*! ../package.json */ "./package.json");
 
@@ -7732,11 +7770,6 @@ yargs.command({
       type: "boolean",
       default: false,
       description: (0, _localization.translate)("options.pushOnly.description")
-    },
-    noValidate: {
-      type: "boolean",
-      default: false,
-      description: (0, _localization.translate)("options.noValidate.description")
     }
   }),
   handler: async _ref2 => {
@@ -7782,7 +7815,8 @@ yargs.command({
 });
 yargs.demandCommand().pkgConf("packager").showHelpOnFail(false).version().argv;
 const notifier = (0, _updateNotifier.default)({
-  pkg: pjson
+  pkg: pjson,
+  shouldNotifyInNpmScript: true
 });
 notifier.notify({
   isGlobal: false,