@itwin/workspace-editor 4.9.0-dev.1 → 4.9.0-dev.3

package/lib/WorkspaceEditor.js

@@ -17,7 +17,6 @@ const core_common_1 = require("@itwin/core-common");
 // cspell:ignore nodir nocase
 /* eslint-disable id-blacklist,no-console */
 /** Currently executing an "@" script? */
-let inScript = false;
 let wsEditor;
 async function askQuestion(query) {
     const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
@@ -45,13 +44,12 @@ function friendlyFileSize(size) {
     const units = Math.floor(Math.log(size) / Math.log(1024));
     return `${Math.round(size / Math.pow(1024, units))}${["", "K", "M", "G", "T"][units]}`;
 }
-// /** Create a new empty WorkspaceDb  */
-// async function createWorkspaceDb(args: CreateWorkspaceDbOpt) {
-//   const wsFile = WorkspaceEditor.createEmptyDb(args);, IModelHost.appWorkspace.getContainer(args));
-//   await wsFile.createDb({ manifest: { workspaceName: args.workspaceName } });
-//   showMessage(`created WorkspaceDb ${wsFile.sqliteDb.nativeDb.getFilePath()}`);
-//   wsFile.close();
-// }
+/** Create a new empty WorkspaceDb  */
+async function createWorkspaceDb(args) {
+    const container = getWriteContainer(args);
+    const wsDb = container.createDb({ ...args, dbName: args.dbName, manifest: { workspaceName: args.workspaceName } });
+    showMessage(`created WorkspaceDb ${(await wsDb).dbName}`);
+}
 /** open, call a function to process, then close a WorkspaceDb */
 async function processWorkspace(args, ws, fn) {
     ws.open();
@@ -65,7 +63,7 @@ async function processWorkspace(args, ws, fn) {
 }
 /** get a WorkspaceContainer that may or may not be a cloud container. */
 function getWriteContainer(args) {
-    return wsEditor.getContainer(args);
+    return wsEditor.getContainer({ ...args, writeable: true });
 }
 function getReadContainer(args) {
     return core_backend_1.IModelHost.appWorkspace.getContainer(args);
@@ -113,9 +111,9 @@ async function listWorkspaceDb(args) {
         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) => {
+            file.sqliteDb.withSqliteStatement("SELECT id,value FROM strings ORDER BY id COLLATE NOCASE", (stmt) => {
                 while (core_bentley_1.DbResult.BE_SQLITE_ROW === stmt.step())
-                    nameAndSize(stmt);
+                    showMessage(`  name="${stmt.getValueString(0)}" value=${stmt.getValueString(1)}`);
             });
         }
         if (args.blobs) {
@@ -310,13 +308,13 @@ async function initializeWorkspace(args) {
     if (undefined === args.storageType || !args.baseUri)
         throw new Error("No cloud container supplied");
     if (!args.noPrompt) {
-        const yesNo = await askQuestion(`Are you sure you want to initialize ${sayContainer(args)}"? [y/n]: `);
+        const yesNo = await askQuestion(`Are you sure you want to initialize "${sayContainer(args)}"? [y/n]: `);
         if (yesNo[0].toUpperCase() !== "Y")
             return;
     }
     const container = core_backend_1.CloudSqlite.createCloudContainer(args);
     container.initializeContainer({ checksumBlockNames: true, blockSize: 4 * 1024 * 1024 });
-    showMessage(`container "${args.containerId} initialized`);
+    showMessage(`container "${args.containerId}" initialized`);
 }
 /** purge unused (garbage) blocks from a WorkspaceContainer. */
 async function purgeWorkspace(args) {
@@ -399,14 +397,15 @@ async function queryWorkspaceDbs(args) {
             showMessage(` "${dbName}", size=${friendlyFileSize(db.totalBlocks * blockSize)}, ${friendlyFileSize(db.localBlocks * blockSize)} downloaded (${(100 * db.localBlocks / db.totalBlocks).toFixed(0)}%)${editable}${dirty}`);
         }
     }
+    if (dbs.length === 0) {
+        showMessage("...there aren't any.");
+    }
 }
 /** Start `IModelHost`, then run a WorkspaceEditor command. Errors are logged to console. */
 function runCommand(cmd, readonly) {
     return async (args) => {
         if (readonly === "readonly")
             args.forReadOnly = true;
-        if (inScript)
-            return cmd(args);
         try {
             const workspace = {
                 containerDir: args.directory,
@@ -461,7 +460,7 @@ Yargs.options({
 });
 Yargs.command({
     command: "add <dbName> <files>",
-    describe: "add files into a WorkspaceDb",
+    describe: "add a resource into a WorkspaceDb",
     builder: addOrReplace,
     handler: runCommand(addResource),
 });
@@ -498,14 +497,14 @@ Yargs.command({
     describe: "delete a WorkspaceDb from a cloud container",
     handler: runCommand(deleteWorkspaceDb),
 });
-// Yargs.command<CreateWorkspaceDbOpt>({
-//   command: "createDb <dbName>",
-//   describe: "create a new WorkspaceDb",
-//   builder: {
-//     workspaceName: { describe: "user interface name for the WorkspaceDb", string: true },
-//   },
-//   handler: runCommand(createWorkspaceDb),
-// });
+Yargs.command({
+    command: "createDb <dbName>",
+    describe: "create a new WorkspaceDb",
+    builder: {
+        workspaceName: { describe: "user interface name for the WorkspaceDb", string: true },
+    },
+    handler: runCommand(createWorkspaceDb),
+});
 Yargs.command({
     command: "copyDb <dbName> <newDbName>",
     describe: "make a copy of a WorkspaceDb in a cloud container with a new name",
@@ -582,7 +581,6 @@ Yargs.command({
 });
 /** execute an "@" script - a list of WorkspaceEditor commands */
 async function runScript(arg) {
-    inScript = true;
     const val = fs.readFileSync(arg.scriptName, "utf-8");
     const lines = val.split(/\r?\n/);
     let i = 0;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@itwin/workspace-editor",
   "license": "MIT",
   "main": "lib/WorkspaceEditor.js",
-  "version": "4.9.0-dev.1",
+  "version": "4.9.0-dev.3",
   "bin": {
     "WorkspaceEditor": "./lib/WorkspaceEditor.js"
   },
@@ -17,9 +17,9 @@
   "dependencies": {
     "glob": "^10.3.12",
     "yargs": "^17.4.0",
-    "@itwin/core-bentley": "4.9.0-dev.1",
-    "@itwin/core-common": "4.9.0-dev.1",
-    "@itwin/core-backend": "4.9.0-dev.1"
+    "@itwin/core-bentley": "4.9.0-dev.3",
+    "@itwin/core-common": "4.9.0-dev.3",
+    "@itwin/core-backend": "4.9.0-dev.3"
   },
   "devDependencies": {
     "@itwin/eslint-plugin": "^4.0.2",
@@ -31,7 +31,7 @@
     "mocha": "^10.2.0",
     "rimraf": "^3.0.2",
     "typescript": "~5.3.3",
-    "@itwin/build-tools": "4.9.0-dev.1"
+    "@itwin/build-tools": "4.9.0-dev.3"
   },
   "scripts": {
     "build": "tsc 1>&2",