datagrok-tools 6.7.7 → 6.7.9

package/bin/utils/node-dapi.js

@@ -3,13 +3,14 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.NodeUsersDataSource = exports.NodeTablesDataSource = exports.NodeSharesDataSource = exports.NodePackagesDataSource = exports.NodeHttpDataSource = exports.NodeGroupsDataSource = exports.NodeFuncsDataSource = exports.NodeFilesDataSource = exports.NodeDomainsDataSource = exports.NodeDapi = exports.NodeConnectionsDataSource = exports.NodeApiClient = exports.InternalDataSource = void 0;
+exports.UUID_RE = exports.NodeUsersDataSource = exports.NodeTablesDataSource = exports.NodeSharesDataSource = exports.NodePackagesDataSource = exports.NodeHttpDataSource = exports.NodeGroupsDataSource = exports.NodeFuncsDataSource = exports.NodeFilesDataSource = exports.NodeDomainsDataSource = exports.NodeDapi = exports.NodeConnectionsDataSource = exports.NodeApiClient = exports.InternalDataSource = void 0;
 exports.apiPath = apiPath;
 exports.buildQuery = buildQuery;
 exports.ensureBodyId = ensureBodyId;
 exports.mapPositionalParams = mapPositionalParams;
 exports.parseDomainAddress = parseDomainAddress;
 exports.throwIfApiError = throwIfApiError;
+exports.tryParseJson = tryParseJson;
 var _crypto = require("crypto");
 var _keypair = require("./keypair");
 /// Docs: [Grok Dapi](/docs/plans/grok-dapi/)
@@ -142,7 +143,7 @@ class NodeApiClient {
       return null;
     }
     const ct = res.headers.get('content-type') ?? '';
-    return throwIfApiError(ct.includes('application/json') ? await res.json() : await res.text());
+    return throwIfApiError(ct.includes('application/json') ? await res.json() : await res.text(), res.headers);
   }
   get(path) {
     return this.request('GET', path);
@@ -170,7 +171,7 @@ class NodeApiClient {
     }, false, BYTES_TIMEOUT_MS);
     if (!res.ok) await throwHttpError(res);
     const ct = res.headers.get('content-type') ?? '';
-    return throwIfApiError(ct.includes('application/json') ? await res.json() : await res.text());
+    return throwIfApiError(ct.includes('application/json') ? await res.json() : await res.text(), res.headers);
   }
 
   /** POST a JSON body and read the response as raw bytes (d42 query results). */
@@ -236,13 +237,15 @@ async function throwHttpError(res) {
  * a JSON string when the handler returned text. Every response passes through here so a
  * missing entity, a rejected save or an unknown function throws instead of printing as data.
  */
-function throwIfApiError(payload) {
+/** A user error answers HTTP 200 with the ApiError in the body and its status in the `api-error-code` header. */
+function throwIfApiError(payload, headers) {
   const parsed = typeof payload === 'string' ? tryParseJson(payload) : payload;
   if (parsed?.['#type'] === 'ApiError') {
+    const code = headers?.get('api-error-code');
     const err = {
       error: parsed.message ?? 'Request failed',
       source: 'Server',
-      errorCode: parsed.errorCode,
+      errorCode: parsed.errorCode ?? (code ? Number(code) : undefined),
       stackTrace: parsed.stackTrace,
       body: parsed
     };
@@ -388,7 +391,7 @@ class InternalDataSource {
   }
 }
 exports.InternalDataSource = InternalDataSource;
-const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+const UUID_RE = exports.UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 class NodeGroupsDataSource extends NodeHttpDataSource {
   constructor(client) {
     super(client, 'groups', '/groups');
@@ -936,6 +939,10 @@ function parseDomainAddress(s, opts = {}) {
   if (opts.table === false && address.table) throw new Error(`'${str}' names a table; this command needs a schema`);
   return address;
 }
+/** Every literal a `/domains/{schema}/{table}/{id}` route registers at the id position, the dot
+ * segments a proxy folds away, and the u2 draft sentinel — the Dart `DomainRowKey.reserved` list. */
+const RESERVED_ROW_KEYS = ['access', 'aggregate', 'audit', 'batch', 'delete', 'facets', 'filters', 'query', 'update', 'version', 'watch', 'new', '.', '..'];
+
 /**
  * Client for entity-mapped domain tables (`/domains/...`, DomainsRouter). Rows are plain
  * JSON objects; the server validates, permission-checks and audits every write. Errors
@@ -950,6 +957,13 @@ class NodeDomainsDataSource {
     return `/domains/${encodeURIComponent(schema)}/${encodeURIComponent(table)}`;
   }
 
+  /** The row-id segment as the Dart `DomainRowKey` spells it (grok_shared domain_manifest_rules.dart):
+   * escaped, then percent-encoded once more so an external key's own `%2C` survives the proxy. */
+  row(schema, table, id) {
+    const escaped = RESERVED_ROW_KEYS.includes(id) || id.startsWith('~') ? `~${id}` : id;
+    return `${this.rows(schema, table)}/${encodeURIComponent(escaped)}`;
+  }
+
   /** Registered schemas with their tables (`GET /domains/schemas`); [text] is a smart filter. */
   schemas(text) {
     return this.client.get(`/domains/schemas${buildQuery({
@@ -1001,7 +1015,7 @@ class NodeDomainsDataSource {
     })}`);
   }
   rowAudit(schema, table, id) {
-    return this.client.get(`${this.rows(schema, table)}/${encodeURIComponent(id)}/audit`);
+    return this.client.get(`${this.row(schema, table, id)}/audit`);
   }
   grants(entityId) {
     return this.client.get(`/domains/grants/${encodeURIComponent(entityId)}`);
@@ -1053,7 +1067,7 @@ class NodeDomainsDataSource {
   /** One row, or null when it does not exist or is not visible (the server answers 404). */
   async getRow(schema, table, id) {
     try {
-      return await this.client.get(`${this.rows(schema, table)}/${encodeURIComponent(id)}`);
+      return await this.client.get(this.row(schema, table, id));
     } catch (err) {
       if (err?.apiError?.errorCode === 404) return null;
       throw err;
@@ -1073,10 +1087,10 @@ class NodeDomainsDataSource {
       values
     };
     if (version !== undefined) body.version = version;
-    return this.client.request('PATCH', `${this.rows(schema, table)}/${encodeURIComponent(id)}`, body);
+    return this.client.request('PATCH', this.row(schema, table, id), body);
   }
   deleteRow(schema, table, id) {
-    return this.client.del(`${this.rows(schema, table)}/${encodeURIComponent(id)}`);
+    return this.client.del(this.row(schema, table, id));
   }
 
   /** Soft-deletes up to [limit] (≤1000) matching rows in one transaction; `{deleted, hasMore}`. */
@@ -1138,6 +1152,9 @@ class NodeDapi {
   get reports() {
     return this.internal('/reports');
   }
+  get problems() {
+    return this.internal('/problems');
+  }
   get files() {
     return new NodeFilesDataSource(this.client);
   }

package/domain-schema.schema.json

@@ -16,6 +16,36 @@
       "type": "string",
       "description": "Manifest version (semver recommended). Recorded in the registry on deploy."
     },
+    "storage": {
+      "type": "object",
+      "description": "Where the rows live. Absent = domain: the platform creates and owns the tables. external: the tables already exist in the database of the named platform connection and are read through it (no row security, soft delete, audit, relations, constraints, property schemas or extensions; read-only unless 'writable'); every table then declares its remote primary key as businessKey, and 'table'/'column' carry the remote names when they differ from the declared ones.",
+      "required": ["kind"],
+      "additionalProperties": false,
+      "properties": {
+        "kind": {"enum": ["domain", "external"]},
+        "connection": {
+          "type": "string",
+          "minLength": 1,
+          "description": "external: the qualified name of the platform connection to read through ('Package:Connection'); required."
+        },
+        "schema": {
+          "$ref": "#/definitions/remoteIdentifier",
+          "description": "external: the schema inside the remote database (e.g. 'public', 'dbo'); required."
+        },
+        "catalog": {
+          "$ref": "#/definitions/remoteIdentifier",
+          "description": "external: the catalog/database, for targets that have one."
+        },
+        "writable": {
+          "type": "boolean",
+          "default": false,
+          "description": "external: rows may be inserted, patched and deleted through the connection (one remote transaction per request, keyed by businessKey; on ClickHouse, which commits every statement, a request is one multi-row INSERT and patch/delete/upsert are refused). The publisher must hold Query, AddRows, ChangeValues and RemoveRows on the connection; a table opts out with its own 'writable': false."
+        }
+      },
+      "if": {"properties": {"kind": {"const": "external"}}},
+      "then": {"required": ["connection", "schema"]},
+      "else": {"properties": {"connection": false, "schema": false, "catalog": false, "writable": false}}
+    },
     "extensible": {
       "type": "object",
       "description": "Opt-in for user extensions of this schema. Users holding the Extend permission on the schema entity may then add their own tables; per-table column extension is opted in with the table's own 'extensible' flag. User objects are retained across plugin upgrades and never appear in generated typed clients.",
@@ -64,11 +94,26 @@
         {"not": {"type": "string", "pattern": "^x_"}}
       ]
     },
+    "remoteIdentifier": {
+      "description": "A name inside the remote database, verbatim (spaces allowed, the connector quotes it); it may not contain brackets, quotes, backslashes or dots.",
+      "type": "string",
+      "minLength": 1,
+      "maxLength": 256,
+      "pattern": "^[^\\[\\]\"'`\\\\.]+$"
+    },
     "table": {
       "type": "object",
       "required": ["columns"],
       "additionalProperties": false,
       "properties": {
+        "table": {
+          "$ref": "#/definitions/remoteIdentifier",
+          "description": "External storage only: the remote table's name when it differs from the declared one (e.g. 'Order Details')."
+        },
+        "writable": {
+          "type": "boolean",
+          "description": "Writable external storage only: false keeps this table read-only while the rest of the binding accepts writes."
+        },
         "securityMode": {
           "enum": ["table", "master", "row"],
           "default": "table",
@@ -263,7 +308,11 @@
       "properties": {
         "type": {
           "enum": ["string", "int", "float", "bool", "datetime", "string_list", "ref", "file", "json", "user", "group"],
-          "description": "Property type; ref = FK to another table in this manifest; user/group = aliases of ref Core.users / ref Core.groups (semantic type User / Group); file = a file://<connection>/<path> string into platform file storage (semantic type File); json = a jsonb-backed opaque object (filters, sorts, facets and aggregates refuse it)."
+          "description": "Property type; ref = FK to another table in this manifest; user/group = aliases of ref Core.users / ref Core.groups (semantic type User / Group); file = a file://<connection>/<path> string into platform file storage (semantic type File); json = a jsonb-backed opaque object (filters, sorts, facets and aggregates refuse it). An external storage admits string, int, float, bool, datetime and same-manifest ref only."
+        },
+        "column": {
+          "$ref": "#/definitions/remoteIdentifier",
+          "description": "External storage only: the remote column's name when it differs from the declared one (e.g. 'OrderID')."
         },
         "required": {"type": "boolean", "default": false},
         "unique": {

package/entity-template/domain-app-imports.js

@@ -1,4 +1,4 @@
-import {domains} from '@datagrok-libraries/u2/src/dg/index.js';
+import {domains} from '@datagrok-libraries/ems/src/dg';
 
 // the skins of everything the u2 domain stack renders
-import '@datagrok-libraries/u2/src/dg/domain/styles.js';
+import '@datagrok-libraries/ems/src/dg/styles.js';

package/package.json

@@ -4,9 +4,12 @@
     "type": "git",
     "url": "https://github.com/datagrok-ai/public.git"
   },
-  "version": "6.7.7",
+  "version": "6.7.9",
   "description": "Utility to upload and publish packages to Datagrok",
   "homepage": "https://github.com/datagrok-ai/public/tree/master/tools#readme",
+  "engines": {
+    "node": ">=22.12.0"
+  },
   "dependencies": {
     "@babel/parser": "^7.29.7",
     "@babel/runtime": "^7.29.7",
@@ -24,7 +27,7 @@
     "minimist": "^1.2.8",
     "node-fetch": "^2.7.0",
     "papaparse": "^5.5.3",
-    "puppeteer": "^24.15.0",
+    "puppeteer": "^25.14.0",
     "ts-morph": "^28.0.0",
     "@babel/generator": "^7.29.0",
     "datagrok-api": "^1.27.12"
@@ -90,7 +93,7 @@
     "update:ivp-parser": "esbuild plugins/ivp-parser.entry.mjs --bundle --format=cjs --platform=node --alias:diff-grok=../libraries/compute-utils/node_modules/diff-grok --outfile=plugins/ivp-parser.bundle.cjs",
     "debug-source-map": "node build.js --source-maps",
     "test": "vitest run --project unit",
-    "test:server": "vitest run --project unit bin/__tests__/node-dapi bin/__tests__/server bin/__tests__/migrate bin/__tests__/keypair",
+    "test:server": "vitest run --project unit bin/__tests__/node-dapi bin/__tests__/server bin/__tests__/migrate bin/__tests__/keypair bin/__tests__/grok-cli",
     "test:watch": "vitest --project unit",
     "test:integration": "vitest run --project integration",
     "test:all": "vitest run"