From eb0f3382ddbb744979d58a538709835329ce7adf Mon Sep 17 00:00:00 2001 From: Esiur Project Date: Thu, 15 Jun 2023 21:08:42 +0300 Subject: [PATCH 1/2] 2.2.7 --- build/esiur.js | 99 ++++++++++++++++++++++++++++---------------------- package.json | 2 +- 2 files changed, 56 insertions(+), 45 deletions(-) diff --git a/build/esiur.js b/build/esiur.js index 654c944..b5ef0e5 100644 --- a/build/esiur.js +++ b/build/esiur.js @@ -885,6 +885,12 @@ var _IDestructible = _interopRequireDefault(require("../Core/IDestructible.js")) function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; } +function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; } + +function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); } + +function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; } + function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } @@ -967,6 +973,23 @@ var AutoList = /*#__PURE__*/function (_IEventHandler) { value: function item(index) { return this.list[index]; } + }, { + key: "first", + value: function first(selector) { + var _iterator = _createForOfIteratorHelper(this.list), + _step; + + try { + for (_iterator.s(); !(_step = _iterator.n()).done;) { + var el = _step.value; + if (selector(el)) return el; + } + } catch (err) { + _iterator.e(err); + } finally { + _iterator.f(); + } + } }, { key: "remove", value: function remove(value) { @@ -1157,18 +1180,6 @@ var _DC = _interopRequireDefault(require("./DC.js")); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; } -function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); } - -function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } - -function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); } - -function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); } - -function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); } - -function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; } - function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } @@ -1227,12 +1238,17 @@ var BinaryList = /*#__PURE__*/function () { }, { key: "addDC", value: function addDC(value) { - var _this$list; - - (_this$list = this.list).push.apply(_this$list, _toConsumableArray(value)); - + // this is bad, will cause Maximum stack execution exception for large arrays + // this.list.push(...value); + // Fixed + this.list = this.list.concat(Array.from(value)); return this; } + }, { + key: "insertDC", + value: function insertDC(position, value) { + this.list = this.list.slice(0, position).concat(value).concat(this.list.slice(position)); + } }, { key: "insertUint8Array", value: function insertUint8Array(position, value) { @@ -7331,11 +7347,11 @@ var DistributedConnection = /*#__PURE__*/function (_IStore) { var parsed = _Codec["default"].parse(content, 0, this, null, transmissionType); - parsed.Then(function (results) { + parsed.then(function (results) { // un hold the socket to send data immediately _this5.socket.unhold(); - var fi = ft.MethodInfo; + var fi = ft.methodInfo; if (fi == null) { // ft found, fi not found, this should never happen @@ -10529,8 +10545,9 @@ var ResourceProxy = /*#__PURE__*/function () { } _createClass(ResourceProxy, null, [{ - key: "getBase", - value: function getBase(type) { + key: "getBaseType", + value: function getBaseType(type) { + if (type == null) throw new Error("Type can't be null."); if (type.baseType != null) return type.baseType; return type; } @@ -13057,7 +13074,7 @@ var TypeTemplate = /*#__PURE__*/function () { key: "getDependencies", value: function getDependencies(template) { var list = []; - list.add(template); + list.push(template); var _getDependenciesFunc = null; _getDependenciesFunc = function getDependenciesFunc(tmp, bag) { @@ -13076,10 +13093,10 @@ var TypeTemplate = /*#__PURE__*/function () { } } - var args = ft.methodInfo.parameters; + var args = ft.methodInfo.args; for (var j = 0; j < args.length - 1; j++) { - var fpt = _Warehouse["default"].getTemplateByType(args[j].parameterType); + var fpt = _Warehouse["default"].getTemplateByType(args[j].type); if (fpt != null) { if (!bag.includes(fpt)) { @@ -13094,8 +13111,8 @@ var TypeTemplate = /*#__PURE__*/function () { if (args.length > 0) { var last = args[args.length - 1]; - if (last.parameterType == _DistributedConnection["default"]) { - var _fpt = _Warehouse["default"].getTemplateByType(last.parameterType); + if (last.type == _DistributedConnection["default"]) { + var _fpt = _Warehouse["default"].getTemplateByType(last.type); if (_fpt != null) { if (!bag.includes(_fpt)) { @@ -13112,7 +13129,7 @@ var TypeTemplate = /*#__PURE__*/function () { for (var _i11 = 0; _i11 < tmp.properties.length; _i11++) { var p = tmp.properties[_i11]; - var pt = _Warehouse["default"].getTemplateByType(p.propertyInfo.propertyType); + var pt = _Warehouse["default"].getTemplateByType(p.propertyInfo.type); if (pt != null) { if (!bag.includes(pt)) { @@ -13127,11 +13144,11 @@ var TypeTemplate = /*#__PURE__*/function () { for (var _i12 = 0; _i12 < tmp.events.length; _i12++) { var e = tmp.events[_i12]; - var et = _Warehouse["default"].getTemplateByType(e.eventInfo.eventHandlerType); + var et = _Warehouse["default"].getTemplateByType(e.eventInfo.type); if (et != null) { if (!bag.includes(et)) { - bag.Add(et); + bag.add(et); _getDependenciesFunc(et, bag); } @@ -13706,26 +13723,20 @@ var WH = /*#__PURE__*/function (_IEventHandler) { }, { key: "getTemplateByType", value: function getTemplateByType(type) { - if (type == null) return null; // search our records + var baseType = _ResourceProxy["default"].getBaseType(type); - var template = this.templates.first(function (x) { - return x.defineType == type; + if (baseType == _IResource["default"] || baseType == _IRecord["default"] || baseType == _IEnum["default"]) return null; // search our records + + var templateType; + if (baseType.prototype instanceof _IResource["default"]) templateType = _TemplateType["default"].Resource;else if (baseType.prototype instanceof _IRecord["default"]) templateType = _TemplateType["default"].Record;else if (baseType.prototype instanceof _IEnum["default"]) templateType = _TemplateType["default"].Enum;else return null; + var template = this.templates.item(templateType).first(function (x) { + return x.definedType == baseType; }); if (template != null) return template; - var templateType; - if (type.prototype instanceof _IResource["default"]) templateType = _TemplateType["default"].Resource;else if (type.prototype instanceof _IRecord["default"]) templateType = _TemplateType["default"].Record;else if (type.prototype instanceof _IEnum["default"]) templateType = _TemplateType["default"].Enum;else return null; - if (type == _IResource["default"] || type == _IRecord["default"]) return null; - if (!(type.prototype instanceof _IResource["default"] || type.prototype instanceof _IRecord["default"])) return false; // let className = type.prototype.constructor.name; - // if (className.startsWith("E_")) - // className = className.substr(2); - // className = type.template.namespace + "." + (type.template.className ?? className); - // var templates = this.templates.get(templateType); - // // loaded ? - // for(var i = 0; i < templates.length; i++) - // if (templates.at(i).className == className) - // return templates.at(i); + template = new _TypeTemplate["default"](baseType, true); + + _TypeTemplate["default"].getDependencies(template); - template = new _TypeTemplate["default"](type, true); return template; } }, { diff --git a/package.json b/package.json index 9b444b0..fefd1f0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "esiur", - "version": "2.2.6", + "version": "2.2.7", "description": "Distributed Object Framework", "main": "esiur.js", "type": "module", From c46dfaf58b0b047fde6b3e267259a912ee3f63d0 Mon Sep 17 00:00:00 2001 From: Esiur Project Date: Mon, 19 Jun 2023 22:30:44 +0300 Subject: [PATCH 2/2] global --- bin/esiur.cjs | 6 +++++- build/esiur.js | 32 ++++++++++++++++++----------- package-lock.json | 37 +++++++++++++++++++++------------- package.json | 2 +- src/Proxy/TemplateGenerator.js | 10 +++++++-- 5 files changed, 57 insertions(+), 30 deletions(-) diff --git a/bin/esiur.cjs b/bin/esiur.cjs index 178617d..8e17305 100644 --- a/bin/esiur.cjs +++ b/bin/esiur.cjs @@ -12,6 +12,8 @@ if (process.argv.length == 2) { console.log("\t-u, --username\tAuthentication username."); console.log("\t-p, --password\tAuthentication password."); console.log("\t-d, --dir\tName of the directory to generate model inside."); + console.log("\t-g, --global\tDeclare a global variable for the module with the specified name."); + process.exit(); } @@ -38,6 +40,8 @@ else if (cmd == "get-template") // get username let username = getOption(args, "--username", "-u"); let password = getOption(args, "--password", "-p"); + let globalName = getOption(args, "--global", "-g"); + let dir = getOption(args, "--dir", "-d"); if (args.length == 0){ @@ -51,7 +55,7 @@ else if (cmd == "get-template") let getTemplate = async () => { let Esiur = (await import('../src/esiur.js')).default; - await Esiur.Proxy.TemplateGenerator.getTemplate(url, dir, username, password, true); + await Esiur.Proxy.TemplateGenerator.getTemplate(url, dir, username, password, true, globalName); process.exit(); } diff --git a/build/esiur.js b/build/esiur.js index b5ef0e5..2d42c98 100644 --- a/build/esiur.js +++ b/build/esiur.js @@ -10938,6 +10938,7 @@ var TemplateGenerator = /*#__PURE__*/function () { var _this3 = this; var asyncSetters, + globalName, fs, _urlRegex, path, @@ -10954,47 +10955,48 @@ var TemplateGenerator = /*#__PURE__*/function () { switch (_context2.prev = _context2.next) { case 0: asyncSetters = _args2.length > 4 && _args2[4] !== undefined ? _args2[4] : true; - _context2.next = 3; + globalName = _args2.length > 5 && _args2[5] !== undefined ? _args2[5] : null; + _context2.next = 4; return Promise.resolve().then(function () { return _interopRequireWildcard(require("fs")); }); - case 3: + case 4: fs = _context2.sent; // var fs = require('fs'); _urlRegex = /^(?:([^\s|:]*):\/\/([^/]*)\/?(.*))/; // /^(?:([^\s|:]*):\/\/([^/]*)\/?)/; if (_urlRegex.test(url)) { - _context2.next = 7; + _context2.next = 8; break; } throw Error("Invalid IIP URL '".concat(url, "'")); - case 7: + case 8: path = url.split(_urlRegex); - _context2.next = 10; + _context2.next = 11; return _Warehouse["default"].get(path[1] + "://" + path[2], username != null ? { "username": username, "password": password !== null && password !== void 0 ? password : "" } : null); - case 10: + case 11: con = _context2.sent; if (!(con == null)) { - _context2.next = 13; + _context2.next = 14; break; } throw Error("Can't connect to server"); - case 13: + case 14: if (dir == null || dir == "") dir = path[2].replaceAll(":", "_"); - _context2.next = 16; + _context2.next = 17; return con.getLinkTemplates(path[3]); - case 16: + case 17: templates = _context2.sent; // no longer needed @@ -11063,11 +11065,17 @@ var TemplateGenerator = /*#__PURE__*/function () { module += "Esiur.define(module, ".concat(typeName, ", '").concat(tmp.className, "');\r\n"); module += "new Esiur.Resource.Template.TypeTemplate(".concat(typeName, ", true);\r\n"); }); - module += "\r\nexport default module;"; + module += "\r\nexport default module;\r\n"; + + if (globalName != null) { + module += "\r\nif (typeof window !== 'undefined') window[\"".concat(globalName, "\"] = module;\r\n"); + module += "\r\nelse if (typeof global !== 'undefined') global[\"".concat(globalName, "\"] = module;\r\n"); + } + fs.writeFileSync(modulePath, module); return _context2.abrupt("return", dstDir); - case 28: + case 30: case "end": return _context2.stop(); } diff --git a/package-lock.json b/package-lock.json index e3f5d27..9762446 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,20 +1,19 @@ { "name": "esiur", - "version": "2.1.3", + "version": "2.2.8", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "esiur", - "version": "2.1.3", + "version": "2.2.8", "license": "MIT", "dependencies": { "mongodb": "^3.6.9", "ws": "^7.5.0" }, "bin": { - "esiur": "bin/esiur.cjs", - "esiur2": "node -i -e \"import('./src/esiur.js');\"" + "esiur": "bin/esiur.cjs" }, "devDependencies": { "@babel/core": "^7.14.6", @@ -2206,14 +2205,24 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001315", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001315.tgz", - "integrity": "sha512-5v7LFQU4Sb/qvkz7JcZkvtSH1Ko+1x2kgo3ocdBeMGZSOFpuE1kkm0kpTwLtWeFrw5qw08ulLxJjVIXIS8MkiQ==", + "version": "1.0.30001504", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001504.tgz", + "integrity": "sha512-5uo7eoOp2mKbWyfMXnGO9rJWOGU8duvzEiYITW+wivukL7yHH4gX9yuRaobu6El4jPxo6jKZfG+N6fB621GD/Q==", "dev": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - } + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ] }, "node_modules/chalk": { "version": "2.4.2", @@ -6696,9 +6705,9 @@ "dev": true }, "caniuse-lite": { - "version": "1.0.30001315", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001315.tgz", - "integrity": "sha512-5v7LFQU4Sb/qvkz7JcZkvtSH1Ko+1x2kgo3ocdBeMGZSOFpuE1kkm0kpTwLtWeFrw5qw08ulLxJjVIXIS8MkiQ==", + "version": "1.0.30001504", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001504.tgz", + "integrity": "sha512-5uo7eoOp2mKbWyfMXnGO9rJWOGU8duvzEiYITW+wivukL7yHH4gX9yuRaobu6El4jPxo6jKZfG+N6fB621GD/Q==", "dev": true }, "chalk": { diff --git a/package.json b/package.json index fefd1f0..e8df772 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "esiur", - "version": "2.2.7", + "version": "2.2.8", "description": "Distributed Object Framework", "main": "esiur.js", "type": "module", diff --git a/src/Proxy/TemplateGenerator.js b/src/Proxy/TemplateGenerator.js index 4b0e2f2..eb41525 100644 --- a/src/Proxy/TemplateGenerator.js +++ b/src/Proxy/TemplateGenerator.js @@ -238,7 +238,7 @@ export default class TemplateGenerator { return v == null || v == ""; } - static async getTemplate(url, dir, username, password, asyncSetters = true) { + static async getTemplate(url, dir, username, password, asyncSetters = true, globalName = null) { const fs = await import("fs"); @@ -318,7 +318,13 @@ export default class TemplateGenerator { module += `new Esiur.Resource.Template.TypeTemplate(${typeName}, true);\r\n` }); - module += "\r\nexport default module;"; + module += "\r\nexport default module;\r\n"; + + if (globalName != null) { + module += `\r\nif (typeof window !== 'undefined') window["${globalName}"] = module;\r\n`; + module += `\r\nelse if (typeof global !== 'undefined') global["${globalName}"] = module;\r\n`; + } + fs.writeFileSync(modulePath, module); return dstDir;