@itwin/workspace-editor 4.0.0-dev.24 → 4.0.0-dev.30

package/lib/WorkspaceEditor.js

@@ -82,19 +82,17 @@ function getCloudContainer(args) {
     return cloudContainer;
 }
 function fixVersionArg(args) {
-    var _a;
     const dbParts = core_backend_1.ITwinWorkspaceContainer.parseDbFileName(args.dbName);
     args.dbName = dbParts.dbName;
-    args.version = (_a = args.version) !== null && _a !== void 0 ? _a : dbParts.version;
+    args.version = args.version ?? dbParts.version;
     args.dbFileName = core_backend_1.ITwinWorkspaceContainer.makeDbFileName(dbParts.dbName, dbParts.version);
 }
 /** Open for write, call a function to process, then close a WorkspaceDb */
 async function editWorkspace(args, fn) {
-    var _a;
     fixVersionArg(args);
     const ws = new core_backend_1.EditableWorkspaceDb(args, getContainer(args));
     const cloudContainer = ws.container.cloudContainer;
-    if (cloudContainer && ((_a = cloudContainer.queryDatabase(ws.dbFileName)) === null || _a === void 0 ? void 0 : _a.state) !== "copied")
+    if (cloudContainer && cloudContainer.queryDatabase(ws.dbFileName)?.state !== "copied")
         throw new Error(`${args.dbFileName} is not editable. Create a new version first`);
     await processWorkspace(args, ws, fn);
 }
@@ -115,7 +113,7 @@ async function listWorkspaceDb(args) {
         }
         if (!args.strings && !args.blobs && !args.files)
             args.blobs = args.files = args.strings = true;
-        const nameAndSize = (stmt, size, info) => showMessage(`  name=${stmt.getValueString(0)}, size=${friendlyFileSize(size !== null && size !== void 0 ? size : stmt.getValueInteger(1))}${info !== null && info !== void 0 ? info : ""}`);
+        const nameAndSize = (stmt, size, info) => showMessage(`  name=${stmt.getValueString(0)}, size=${friendlyFileSize(size ?? stmt.getValueInteger(1))}${info ?? ""}`);
         if (args.strings) {
             showMessage(" strings:");
             file.sqliteDb.withSqliteStatement("SELECT id,LENGTH(value) FROM strings ORDER BY id COLLATE NOCASE", (stmt) => {
@@ -161,13 +159,11 @@ async function listWorkspaceDb(args) {
 /** Add files into a WorkspaceDb. */
 async function addResource(args) {
     return editWorkspace(args, async (wsFile, args) => {
-        var _a;
-        glob.sync(args.files, { cwd: (_a = args.root) !== null && _a !== void 0 ? _a : process.cwd(), nodir: true }).forEach((filePath) => {
-            var _a;
+        glob.sync(args.files, { cwd: args.root ?? process.cwd(), nodir: true }).forEach((filePath) => {
             const file = args.root ? (0, path_1.join)(args.root, filePath) : filePath;
             if (!core_backend_1.IModelJsFs.existsSync(file))
                 throw new Error(`file [${file}] does not exist`);
-            const name = (_a = args.rscName) !== null && _a !== void 0 ? _a : filePath;
+            const name = args.rscName ?? filePath;
             try {
                 if (args.type === "string") {
                     const val = fs.readFileSync(file, "utf-8");
@@ -191,13 +187,11 @@ async function addResource(args) {
 /** Replace files in a WorkspaceDb. */
 async function replaceResource(args) {
     return editWorkspace(args, async (wsFile, args) => {
-        var _a;
-        glob.sync(args.files, { cwd: (_a = args.root) !== null && _a !== void 0 ? _a : process.cwd(), nodir: true }).forEach((filePath) => {
-            var _a;
+        glob.sync(args.files, { cwd: args.root ?? process.cwd(), nodir: true }).forEach((filePath) => {
             const file = args.root ? (0, path_1.join)(args.root, filePath) : filePath;
             if (!core_backend_1.IModelJsFs.existsSync(file))
                 throw new Error(`file [${file}] does not exist`);
-            const name = (_a = args.rscName) !== null && _a !== void 0 ? _a : filePath;
+            const name = args.rscName ?? filePath;
             try {
                 if (args.type === "string") {
                     const val = fs.readFileSync(file, "utf-8");
@@ -284,12 +278,11 @@ async function performTransfer(container, direction, args) {
 }
 /** import a WorkspaceDb to a cloud WorkspaceContainer. */
 async function importWorkspaceDb(args) {
-    var _a;
     const container = getCloudContainer(args);
     if ("" === (0, path_1.extname)(args.localFileName))
         args.localFileName = `${args.localFileName}.${core_backend_1.ITwinWorkspaceDb.fileExt}`;
     if (!core_backend_1.IModelJsFs.existsSync(args.localFileName))
-        args.localFileName = (0, path_1.join)((_a = args.directory) !== null && _a !== void 0 ? _a : core_backend_1.IModelHost.appWorkspace.containerDir, args.localFileName);
+        args.localFileName = (0, path_1.join)(args.directory ?? core_backend_1.IModelHost.appWorkspace.containerDir, args.localFileName);
     await core_backend_1.CloudSqlite.withWriteLock(args.user, container, async () => {
         await performTransfer(container, "upload", args);
     });
@@ -412,7 +405,6 @@ async function queryWorkspaceDbs(args) {
 /** Start `IModelHost`, then run a WorkspaceEditor command. Errors are logged to console. */
 function runCommand(cmd) {
     return async (args) => {
-        var _a;
         if (inScript)
             return cmd(args);
         try {
@@ -427,7 +419,7 @@ function runCommand(cmd) {
             if (true === args.logging) {
                 core_bentley_1.Logger.initializeToConsole();
                 core_bentley_1.Logger.setLevel("CloudSqlite", core_bentley_1.LogLevel.Trace);
-                (_a = core_backend_1.IModelHost.appWorkspace.cloudCache) === null || _a === void 0 ? void 0 : _a.setLogMask(core_backend_1.CloudSqlite.LoggingMask.All);
+                core_backend_1.IModelHost.appWorkspace.cloudCache?.setLogMask(core_backend_1.CloudSqlite.LoggingMask.All);
                 logTimer = setInterval(() => flushLog(), 250); // logging from other threads is buffered. This causes it to appear every 1/4 second.
             }
             await cmd(args);
@@ -610,8 +602,7 @@ async function runScript(arg) {
 }
 /** Parse and execute WorkspaceEditor commands */
 async function main() {
-    var _a;
-    if (process.argv.length > 1 && ((_a = process.argv[2]) === null || _a === void 0 ? void 0 : _a[0]) === "@") {
+    if (process.argv.length > 1 && process.argv[2]?.[0] === "@") {
         const parsed = Yargs.parseSync(process.argv.slice(3));
         if (parsed.config)
             process.env.WORKSPACE_EDITOR_CONFIG = parsed.config;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@itwin/workspace-editor",
   "license": "MIT",
   "main": "lib/WorkspaceEditor.js",
-  "version": "4.0.0-dev.24",
+  "version": "4.0.0-dev.30",
   "bin": {
     "WorkspaceEditor": "./lib/WorkspaceEditor.js"
   },
@@ -14,15 +14,15 @@
     "url": "https://github.com/iTwin/itwinjs-core/tree/master/utils/workspace-editor"
   },
   "dependencies": {
-    "@itwin/core-bentley": "4.0.0-dev.24",
-    "@itwin/core-common": "4.0.0-dev.24",
-    "@itwin/core-backend": "4.0.0-dev.24",
+    "@itwin/core-bentley": "4.0.0-dev.30",
+    "@itwin/core-common": "4.0.0-dev.30",
+    "@itwin/core-backend": "4.0.0-dev.30",
     "glob": "^7.1.2",
     "yargs": "^17.4.0"
   },
   "devDependencies": {
-    "@itwin/build-tools": "4.0.0-dev.24",
-    "@itwin/eslint-plugin": "4.0.0-dev.24",
+    "@itwin/build-tools": "4.0.0-dev.30",
+    "@itwin/eslint-plugin": "4.0.0-dev.30",
     "@types/chai": "4.3.1",
     "@types/mocha": "^8.2.2",
     "@types/yargs": "17.0.19",