@cedarjs/structure 2.8.1-next.109 → 2.8.1-rc.3

package/dist/x/diagnostics.js

@@ -1,51 +1,87 @@
-import lc from 'line-column';
-import groupBy from 'lodash/groupBy.js';
-import mapValues from 'lodash/mapValues.js';
-import uniqBy from 'lodash/uniqBy.js';
-import * as tsm from 'ts-morph';
-import { Location_is } from './Location.js';
-import { Position_compare } from './Position.js';
-import { Range_create } from './Range.js';
-import { URL_file } from './URL.js';
-export var DiagnosticSeverity;
-(function (DiagnosticSeverity) {
-    DiagnosticSeverity[DiagnosticSeverity["Error"] = 1] = "Error";
-    DiagnosticSeverity[DiagnosticSeverity["Warning"] = 2] = "Warning";
-    DiagnosticSeverity[DiagnosticSeverity["Information"] = 3] = "Information";
-    DiagnosticSeverity[DiagnosticSeverity["Hint"] = 4] = "Hint";
-})(DiagnosticSeverity || (DiagnosticSeverity = {}));
-export function Diagnostic_is(value) {
-    const candidate = value;
-    return (candidate &&
-        typeof candidate.message === 'string' &&
-        typeof candidate.range === 'object' &&
-        candidate.range.start !== undefined &&
-        candidate.range.end !== undefined);
-}
-export function Range_contains(range, pos) {
-    if (Position_compare(range.start, pos) === 'greater') {
-        return false;
-    }
-    if (Position_compare(range.end, pos) === 'smaller') {
-        return false;
-    }
-    return true;
+"use strict";
+
+var _Object$defineProperty = require("@babel/runtime-corejs3/core-js/object/define-property");
+var _interopRequireWildcard = require("@babel/runtime-corejs3/helpers/interopRequireWildcard").default;
+var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
+_Object$defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.DiagnosticSeverity = void 0;
+exports.Diagnostic_is = Diagnostic_is;
+exports.ExtendedDiagnostic_format = ExtendedDiagnostic_format;
+exports.ExtendedDiagnostic_groupByUri = ExtendedDiagnostic_groupByUri;
+exports.ExtendedDiagnostic_is = ExtendedDiagnostic_is;
+exports.LocationLike_toHashLink = LocationLike_toHashLink;
+exports.LocationLike_toLocation = LocationLike_toLocation;
+exports.LocationLike_toTerminalLink = LocationLike_toTerminalLink;
+exports.Location_fromFilePath = Location_fromFilePath;
+exports.Location_fromNode = Location_fromNode;
+exports.Location_overlaps = Location_overlaps;
+exports.Position_fromOffset = Position_fromOffset;
+exports.Position_fromOffsetOrFail = Position_fromOffsetOrFail;
+exports.Position_fromTSMorphOffset = Position_fromTSMorphOffset;
+exports.Position_translate = Position_translate;
+exports.Range_contains = Range_contains;
+exports.Range_fromNode = Range_fromNode;
+exports.Range_overlaps = Range_overlaps;
+exports.err = err;
+var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/instance/map"));
+var _stringify = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/json/stringify"));
+var _endsWith = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/instance/ends-with"));
+var _lineColumn = _interopRequireDefault(require("line-column"));
+var _groupBy = _interopRequireDefault(require("lodash/groupBy.js"));
+var _mapValues = _interopRequireDefault(require("lodash/mapValues.js"));
+var _uniqBy = _interopRequireDefault(require("lodash/uniqBy.js"));
+var tsm = _interopRequireWildcard(require("ts-morph"));
+var _Location = require("./Location");
+var _Position = require("./Position");
+var _Range = require("./Range");
+var _URL = require("./URL");
+let DiagnosticSeverity = exports.DiagnosticSeverity = /*#__PURE__*/function (DiagnosticSeverity) {
+  DiagnosticSeverity[DiagnosticSeverity["Error"] = 1] = "Error";
+  DiagnosticSeverity[DiagnosticSeverity["Warning"] = 2] = "Warning";
+  DiagnosticSeverity[DiagnosticSeverity["Information"] = 3] = "Information";
+  DiagnosticSeverity[DiagnosticSeverity["Hint"] = 4] = "Hint";
+  return DiagnosticSeverity;
+}({});
+function Diagnostic_is(value) {
+  const candidate = value;
+  return candidate && typeof candidate.message === 'string' && typeof candidate.range === 'object' && candidate.range.start !== undefined && candidate.range.end !== undefined;
 }
-export function Range_overlaps(range1, range2, consider0000) {
-    if (consider0000) {
-        if (Range_is0000(range1) || Range_is0000(range2)) {
-            return true;
-        }
-    }
-    const { start, end } = range2;
-    if (Range_contains(range1, start)) {
-        return true;
-    }
-    if (Range_contains(range2, end)) {
-        return true;
+
+/**
+ * The Diagnostic interface does not include the document URI.
+ * This interface adds that, and a few other things.
+ */
+
+function Range_contains(range, pos) {
+  if ((0, _Position.Position_compare)(range.start, pos) === 'greater') {
+    return false;
+  }
+  if ((0, _Position.Position_compare)(range.end, pos) === 'smaller') {
+    return false;
+  }
+  return true;
+}
+function Range_overlaps(range1, range2, consider0000) {
+  if (consider0000) {
+    if (Range_is0000(range1) || Range_is0000(range2)) {
+      return true;
     }
+  }
+  const {
+    start,
+    end
+  } = range2;
+  if (Range_contains(range1, start)) {
+    return true;
+  }
+  if (Range_contains(range2, end)) {
     return true;
+  }
+  return true;
 }
+
 /**
  * Create a new position relative to this position.
  *
@@ -54,146 +90,201 @@ export function Range_overlaps(range1, range2, consider0000) {
  * @return A position which line and character is the sum of the current line and
  * character and the corresponding deltas.
  */
-export function Position_translate(pos, lineDelta = 0, characterDelta = 0) {
-    return {
-        line: pos.line + lineDelta,
-        character: pos.character + characterDelta,
-    };
+function Position_translate(pos, lineDelta = 0, characterDelta = 0) {
+  return {
+    line: pos.line + lineDelta,
+    character: pos.character + characterDelta
+  };
 }
-export function Range_fromNode(node) {
-    const start = Position_fromTSMorphOffset(node.getStart(false), node.getSourceFile());
-    const end = Position_fromTSMorphOffset(node.getEnd(), node.getSourceFile());
-    return { start, end };
+function Range_fromNode(node) {
+  const start = Position_fromTSMorphOffset(node.getStart(false), node.getSourceFile());
+  const end = Position_fromTSMorphOffset(node.getEnd(), node.getSourceFile());
+  return {
+    start,
+    end
+  };
 }
-export function Location_fromNode(node) {
-    return {
-        uri: URL_file(node.getSourceFile().getFilePath()),
-        range: Range_fromNode(node),
-    };
+function Location_fromNode(node) {
+  return {
+    uri: (0, _URL.URL_file)(node.getSourceFile().getFilePath()),
+    range: Range_fromNode(node)
+  };
 }
-export function Location_fromFilePath(filePath) {
-    return { uri: URL_file(filePath), range: Range_create(0, 0, 0, 0) };
+function Location_fromFilePath(filePath) {
+  return {
+    uri: (0, _URL.URL_file)(filePath),
+    range: (0, _Range.Range_create)(0, 0, 0, 0)
+  };
 }
+
 /**
  * returns vscode-terminal-friendly (clickable) link with line/column information
  * ex: "file:///foo.ts:2:3"
  * @param loc
  */
-export function LocationLike_toTerminalLink(loc) {
-    const { uri, range: { start: { line, character }, }, } = LocationLike_toLocation(loc);
-    return `${uri}:${line + 1}:${character + 1}`;
+function LocationLike_toTerminalLink(loc) {
+  const {
+    uri,
+    range: {
+      start: {
+        line,
+        character
+      }
+    }
+  } = LocationLike_toLocation(loc);
+  return `${uri}:${line + 1}:${character + 1}`;
 }
+
 /**
  * returns vscode-terminal-friendly (clickable) link with line/column information
  * ex: "file:///foo.ts:2:3"
  * @param loc
  */
-export function LocationLike_toHashLink(loc) {
-    const { uri, range: { start: { line, character }, }, } = LocationLike_toLocation(loc);
-    return `${uri}#${line + 1}:${character + 1}`;
+function LocationLike_toHashLink(loc) {
+  const {
+    uri,
+    range: {
+      start: {
+        line,
+        character
+      }
+    }
+  } = LocationLike_toLocation(loc);
+  return `${uri}#${line + 1}:${character + 1}`;
 }
-export function LocationLike_toLocation(x) {
-    if (typeof x === 'string') {
-        return { uri: URL_file(x), range: Range_create(0, 0, 0, 0) };
+function LocationLike_toLocation(x) {
+  if (typeof x === 'string') {
+    return {
+      uri: (0, _URL.URL_file)(x),
+      range: (0, _Range.Range_create)(0, 0, 0, 0)
+    };
+  }
+  if (typeof x === 'object') {
+    if (x instanceof tsm.Node) {
+      return Location_fromNode(x);
     }
-    if (typeof x === 'object') {
-        if (x instanceof tsm.Node) {
-            return Location_fromNode(x);
-        }
-        if (Location_is(x)) {
-            return x;
-        }
-        if (ExtendedDiagnostic_is(x)) {
-            return { uri: x.uri, range: x.diagnostic.range };
-        }
+    if ((0, _Location.Location_is)(x)) {
+      return x;
     }
-    throw new Error();
-}
-export function Location_overlaps(loc1, loc2, consider0000 = false) {
-    if (loc1.uri !== loc2.uri) {
-        return false;
+    if (ExtendedDiagnostic_is(x)) {
+      return {
+        uri: x.uri,
+        range: x.diagnostic.range
+      };
     }
-    return Range_overlaps(loc1.range, loc2.range, consider0000);
+  }
+  throw new Error();
+}
+function Location_overlaps(loc1, loc2, consider0000 = false) {
+  if (loc1.uri !== loc2.uri) {
+    return false;
+  }
+  return Range_overlaps(loc1.range, loc2.range, consider0000);
 }
+
 /**
  * by convention, the range [0,0,0,0] means the complete document
  * @param range
  */
 function Range_is0000(range) {
-    const { start, end } = range;
-    return Position_is00(start) && Position_is00(end);
+  const {
+    start,
+    end
+  } = range;
+  return Position_is00(start) && Position_is00(end);
 }
 function Position_is00(pos) {
-    return pos.character === 0 && pos.line === 0;
+  return pos.character === 0 && pos.line === 0;
 }
-export function ExtendedDiagnostic_is(x) {
-    if (typeof x !== 'object') {
-        return false;
-    }
-    if (typeof x === 'undefined') {
-        return false;
-    }
-    if (typeof x.uri !== 'string') {
-        return false;
-    }
-    if (!Diagnostic_is(x.diagnostic)) {
-        return false;
-    }
-    return true;
+function ExtendedDiagnostic_is(x) {
+  if (typeof x !== 'object') {
+    return false;
+  }
+  if (typeof x === 'undefined') {
+    return false;
+  }
+  if (typeof x.uri !== 'string') {
+    return false;
+  }
+  if (!Diagnostic_is(x.diagnostic)) {
+    return false;
+  }
+  return true;
 }
-export function ExtendedDiagnostic_groupByUri(ds) {
-    const grouped = groupBy(ds, (d) => d.uri);
-    const dss = mapValues(grouped, (xds) => {
-        const dd = xds.map((xd) => xd.diagnostic);
-        return uniqBy(dd, JSON.stringify); // dedupe
-    });
-    return dss;
-}
-export function Position_fromTSMorphOffset(offset, sf) {
-    const { line, column } = sf.getLineAndColumnAtPos(offset);
-    return { character: column - 1, line: line - 1 };
-}
-export function Position_fromOffset(offset, text) {
-    const res = lc(text).fromIndex(offset);
-    if (!res) {
-        return undefined;
-    }
-    const { line, col } = res;
-    return { character: col - 1, line: line - 1 };
+function ExtendedDiagnostic_groupByUri(ds) {
+  const grouped = (0, _groupBy.default)(ds, d => d.uri);
+  const dss = (0, _mapValues.default)(grouped, xds => {
+    const dd = (0, _map.default)(xds).call(xds, xd => xd.diagnostic);
+    return (0, _uniqBy.default)(dd, _stringify.default); // dedupe
+  });
+  return dss;
 }
-export function Position_fromOffsetOrFail(offset, text) {
-    const p = Position_fromOffset(offset, text);
-    if (!p) {
-        throw new Error('Position_fromOffsetOrFail');
-    }
-    return p;
+function Position_fromTSMorphOffset(offset, sf) {
+  const {
+    line,
+    column
+  } = sf.getLineAndColumnAtPos(offset);
+  return {
+    character: column - 1,
+    line: line - 1
+  };
 }
+function Position_fromOffset(offset, text) {
+  const res = (0, _lineColumn.default)(text).fromIndex(offset);
+  if (!res) {
+    return undefined;
+  }
+  const {
+    line,
+    col
+  } = res;
+  return {
+    character: col - 1,
+    line: line - 1
+  };
+}
+function Position_fromOffsetOrFail(offset, text) {
+  const p = Position_fromOffset(offset, text);
+  if (!p) {
+    throw new Error('Position_fromOffsetOrFail');
+  }
+  return p;
+}
+
 /**
  * Helper method to create diagnostics
  * @param node
  * @param message
  */
-export function err(loc, message, code) {
-    const { uri, range } = LocationLike_toLocation(loc);
-    return {
-        uri,
-        diagnostic: {
-            range,
-            message,
-            severity: DiagnosticSeverity.Error,
-            code,
-        },
-    };
+function err(loc, message, code) {
+  const {
+    uri,
+    range
+  } = LocationLike_toLocation(loc);
+  return {
+    uri,
+    diagnostic: {
+      range,
+      message,
+      severity: DiagnosticSeverity.Error,
+      code
+    }
+  };
 }
 function DiagnosticSeverity_getLabel(severity) {
-    const { Information, Error, Hint, Warning } = DiagnosticSeverity;
-    const labels = {
-        [Information]: 'info',
-        [Error]: 'error',
-        [Hint]: 'hint',
-        [Warning]: 'warning',
-    };
-    return labels[severity ?? Information];
+  const {
+    Information,
+    Error,
+    Hint,
+    Warning
+  } = DiagnosticSeverity;
+  const labels = {
+    [Information]: 'info',
+    [Error]: 'error',
+    [Hint]: 'hint',
+    [Warning]: 'warning'
+  };
+  return labels[severity ?? Information];
 }
 /**
  * Returns a string representation of a diagnostic.
@@ -201,21 +292,26 @@ function DiagnosticSeverity_getLabel(severity) {
  * ex: "b.ts:1:2: error: this is a message"
  * ex: "/path/to/app/b.ts:1:2: info: this is a message"
  */
-export function ExtendedDiagnostic_format(d, opts) {
-    const { diagnostic: { severity, message, code }, } = d;
-    const cwd = opts?.cwd;
-    const getSeverityLabel = opts?.getSeverityLabel ?? DiagnosticSeverity_getLabel;
-    let base = 'file://';
-    if (cwd) {
-        base = URL_file(cwd);
+function ExtendedDiagnostic_format(d, opts) {
+  const {
+    diagnostic: {
+      severity,
+      message,
+      code
     }
-    if (!base.endsWith('/')) {
-        base += '/';
-    }
-    const file = LocationLike_toTerminalLink(d).substr(base.length);
-    const severityLabel = getSeverityLabel(severity);
-    const errorCode = code ? ` (${code})` : '';
-    const str = `${file}: ${severityLabel}${errorCode}: ${message}`;
-    return str;
-}
-//# sourceMappingURL=diagnostics.js.map
+  } = d;
+  const cwd = opts?.cwd;
+  const getSeverityLabel = opts?.getSeverityLabel ?? DiagnosticSeverity_getLabel;
+  let base = 'file://';
+  if (cwd) {
+    base = (0, _URL.URL_file)(cwd);
+  }
+  if (!(0, _endsWith.default)(base).call(base, '/')) {
+    base += '/';
+  }
+  const file = LocationLike_toTerminalLink(d).substr(base.length);
+  const severityLabel = getSeverityLabel(severity);
+  const errorCode = code ? ` (${code})` : '';
+  const str = `${file}: ${severityLabel}${errorCode}: ${message}`;
+  return str;
+}

package/dist/x/path.js

@@ -1,42 +1,61 @@
-import fs from 'node:fs';
-import { basename, normalize, sep } from 'node:path';
-export function globSync(pattern) {
-    // fs.globSync requires forward slashes as path separators in patterns, even on Windows.
-    return fs.globSync(pattern.replaceAll('\\', '/')).map((p) => p.toString());
+"use strict";
+
+var _Object$defineProperty = require("@babel/runtime-corejs3/core-js/object/define-property");
+var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
+_Object$defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.basenameNoExt = basenameNoExt;
+exports.directoryNameResolver = directoryNameResolver;
+exports.followsDirNameConvention = followsDirNameConvention;
+exports.globSync = globSync;
+exports.isCellFileName = isCellFileName;
+exports.isLayoutFileName = isLayoutFileName;
+require("core-js/modules/es.array.push.js");
+var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/instance/map"));
+var _replaceAll = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/instance/replace-all"));
+var _endsWith = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/instance/ends-with"));
+var _nodeFs = _interopRequireDefault(require("node:fs"));
+var _nodePath = require("node:path");
+function globSync(pattern) {
+  var _context;
+  // fs.globSync requires forward slashes as path separators in patterns, even on Windows.
+  return (0, _map.default)(_context = _nodeFs.default.globSync((0, _replaceAll.default)(pattern).call(pattern, '\\', '/'))).call(_context, p => p.toString());
 }
-export function directoryNameResolver(dirName) {
-    dirName = normalize(dirName);
-    const parts = dirName.split(sep);
-    const pp = parts[parts.length - 1];
-    parts.push(pp);
-    const extensions = ['.js', '.jsx', '.ts', '.tsx'];
-    const pathNoExt = parts.join(sep);
-    for (const ext of extensions) {
-        const path = pathNoExt + ext;
-        if (fs.existsSync(path)) {
-            return path;
-        }
+function directoryNameResolver(dirName) {
+  dirName = (0, _nodePath.normalize)(dirName);
+  const parts = dirName.split(_nodePath.sep);
+  const pp = parts[parts.length - 1];
+  parts.push(pp);
+  const extensions = ['.js', '.jsx', '.ts', '.tsx'];
+  const pathNoExt = parts.join(_nodePath.sep);
+  for (const ext of extensions) {
+    const path = pathNoExt + ext;
+    if (_nodeFs.default.existsSync(path)) {
+      return path;
     }
+  }
 }
-export function followsDirNameConvention(filePath) {
-    filePath = normalize(filePath);
-    const ending = basenameNoExt(filePath) + sep + basename(filePath);
-    return filePath.endsWith(ending);
+function followsDirNameConvention(filePath) {
+  filePath = (0, _nodePath.normalize)(filePath);
+  const ending = basenameNoExt(filePath) + _nodePath.sep + (0, _nodePath.basename)(filePath);
+  return (0, _endsWith.default)(filePath).call(filePath, ending);
 }
-export function basenameNoExt(path) {
-    path = normalize(path);
-    const parts = basename(path).split('.');
-    if (parts.length > 1) {
-        parts.pop();
-    }
-    return parts.join('.');
-}
-export function isLayoutFileName(f) {
-    f = normalize(f);
-    return basenameNoExt(f).endsWith('Layout');
+function basenameNoExt(path) {
+  path = (0, _nodePath.normalize)(path);
+  const parts = (0, _nodePath.basename)(path).split('.');
+  if (parts.length > 1) {
+    parts.pop();
+  }
+  return parts.join('.');
 }
-export function isCellFileName(f) {
-    f = normalize(f);
-    return basenameNoExt(f).endsWith('Cell');
+function isLayoutFileName(f) {
+  var _context2;
+  f = (0, _nodePath.normalize)(f);
+  return (0, _endsWith.default)(_context2 = basenameNoExt(f)).call(_context2, 'Layout');
 }
-//# sourceMappingURL=path.js.map
+function isCellFileName(f) {
+  var _context3;
+  f = (0, _nodePath.normalize)(f);
+  return (0, _endsWith.default)(_context3 = basenameNoExt(f)).call(_context3, 'Cell');
+}

package/dist/x/prisma.d.ts

@@ -1,4 +1,4 @@
-import type { Location } from './Location.js';
+import type { Location } from './Location';
 /**
  * find "env()" expressions in a prisma file using regex
  * @param prismaSchemaFilePath
@@ -12,7 +12,7 @@ export declare function prisma_parseEnvExpressionsInFile(prismaSchemaFilePath: s
  * @param src
  */
 export declare function prisma_parseEnvExpressions(src: string): Generator<{
-    range: import("./Range.js").Range;
+    range: import("./Range").Range;
     key: any;
 }, void, unknown>;
 //# sourceMappingURL=prisma.d.ts.map

package/dist/x/prisma.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prisma.d.ts","sourceRoot":"","sources":["../../src/x/prisma.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAI7C;;;GAGG;AACH,wBAAiB,gCAAgC,CAC/C,oBAAoB,EAAE,MAAM;;;iCAa7B;AAED;;;GAGG;AACH,wBAAiB,0BAA0B,CAAC,GAAG,EAAE,MAAM;;;kBActD"}
+{"version":3,"file":"prisma.d.ts","sourceRoot":"","sources":["../../src/x/prisma.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAI1C;;;GAGG;AACH,wBAAiB,gCAAgC,CAC/C,oBAAoB,EAAE,MAAM;;;iCAa7B;AAED;;;GAGG;AACH,wBAAiB,0BAA0B,CAAC,GAAG,EAAE,MAAM;;;kBActD"}