@malloydata/malloy-tag 0.0.339 → 0.0.341

package/dist/index.d.ts

@@ -1,5 +1,3 @@
 export * from './tags';
-export { parseTag } from './peggy';
+export { parseTag, TagParser } from './parser';
 export * as ParseUtil from './util';
-export { validateTag } from './schema';
-export type { SchemaError } from './schema';

package/dist/index.js

@@ -36,7 +36,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateTag = exports.ParseUtil = exports.parseTag = void 0;
+exports.ParseUtil = exports.TagParser = exports.parseTag = void 0;
 /*
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
@@ -44,9 +44,8 @@ exports.validateTag = exports.ParseUtil = exports.parseTag = void 0;
  * LICENSE file in the root directory of this source tree.
  */
 __exportStar(require("./tags"), exports);
-var peggy_1 = require("./peggy");
-Object.defineProperty(exports, "parseTag", { enumerable: true, get: function () { return peggy_1.parseTag; } });
+var parser_1 = require("./parser");
+Object.defineProperty(exports, "parseTag", { enumerable: true, get: function () { return parser_1.parseTag; } });
+Object.defineProperty(exports, "TagParser", { enumerable: true, get: function () { return parser_1.TagParser; } });
 exports.ParseUtil = __importStar(require("./util"));
-var schema_1 = require("./schema");
-Object.defineProperty(exports, "validateTag", { enumerable: true, get: function () { return schema_1.validateTag; } });
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;GAKG;AACH,yCAAuB;AACvB,iCAAiC;AAAzB,iGAAA,QAAQ,OAAA;AAChB,oDAAoC;AACpC,mCAAqC;AAA7B,qGAAA,WAAW,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;GAKG;AACH,yCAAuB;AACvB,mCAA6C;AAArC,kGAAA,QAAQ,OAAA;AAAE,mGAAA,SAAS,OAAA;AAC3B,oDAAoC"}

package/dist/{peggy/index.d.ts → parser.d.ts}

@@ -1,13 +1,22 @@
-import type { TagParse } from '../tags';
-import { Tag } from '../tags';
+import { Tag } from './tags';
+import type { TagParse } from './tags';
+/**
+ * Session-based parser for Malloy tag language. Create an instance,
+ * call parse() for each line, then finish() to get the final Tag.
+ */
+export declare class TagParser {
+    private session;
+    constructor();
+    parse(source: string): TagParse;
+    finish(): Tag;
+}
 /**
  * Parse Malloy tag language into a Tag which can be queried.
  *
  * @param source - A single string or array of strings to parse. If a string
  *   starts with #, all characters up to the first space are skipped.
  *   When an array is provided, strings are parsed sequentially and merged.
- * @param extending - A tag which this parse will extend
  * @returns TagParse with the resulting tag and any errors. For arrays,
  *   error line numbers indicate the index in the array where the error occurred.
  */
-export declare function parseTag(source: string | string[], extending?: Tag): TagParse;
+export declare function parseTag(source: string | string[]): TagParse;

package/dist/parser.js

@@ -0,0 +1,181 @@
+"use strict";
+/*
+ * Copyright Contributors to the Malloy project
+ * SPDX-License-Identifier: MIT
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TagParser = void 0;
+exports.parseTag = parseTag;
+const motly_ts_parser_1 = require("@malloydata/motly-ts-parser");
+const tags_1 = require("./tags");
+/**
+ * Strip the Malloy tag prefix (e.g., "# " or "#(docs) ") from source.
+ */
+function stripPrefix(source) {
+    if (source[0] === '#') {
+        const skipTo = source.indexOf(' ');
+        if (skipTo > 0) {
+            return source.slice(skipTo);
+        }
+        return '';
+    }
+    return source;
+}
+/**
+ * Map a MOTLYError (from motly-ts parser) to a TagError.
+ */
+function mapMOTLYError(error) {
+    return {
+        code: error.code,
+        message: error.message,
+        line: error.begin.line,
+        offset: error.begin.column,
+    };
+}
+/**
+ * Parse a reference string like "$^^path.to[0].thing" back into
+ * structured form {ups, refPath}.
+ */
+function parseRefString(linkTo) {
+    let i = 1;
+    let ups = 0;
+    while (i < linkTo.length && linkTo[i] === '^') {
+        ups++;
+        i++;
+    }
+    const refPath = [];
+    const rest = linkTo.slice(i);
+    if (rest.length === 0) {
+        return { ups, refPath };
+    }
+    let pos = 0;
+    let needDot = false;
+    while (pos < rest.length) {
+        if (rest[pos] === '.') {
+            pos++;
+            needDot = false;
+            continue;
+        }
+        if (rest[pos] === '[') {
+            const close = rest.indexOf(']', pos);
+            refPath.push(Number(rest.slice(pos + 1, close)));
+            pos = close + 1;
+            needDot = true;
+            continue;
+        }
+        if (needDot) {
+            // Expected a dot separator but didn't get one
+        }
+        if (rest[pos] === '`') {
+            pos++;
+            let seg = '';
+            while (pos < rest.length && rest[pos] !== '`') {
+                if (rest[pos] === '\\') {
+                    pos++;
+                    seg += rest[pos];
+                }
+                else {
+                    seg += rest[pos];
+                }
+                pos++;
+            }
+            pos++;
+            refPath.push(seg);
+            needDot = true;
+            continue;
+        }
+        let seg = '';
+        while (pos < rest.length &&
+            rest[pos] !== '.' &&
+            rest[pos] !== '[' &&
+            rest[pos] !== '`') {
+            seg += rest[pos];
+            pos++;
+        }
+        if (seg.length > 0) {
+            refPath.push(seg);
+            needDot = true;
+        }
+    }
+    return { ups, refPath };
+}
+function isRef(node) {
+    return 'linkTo' in node;
+}
+/**
+ * Convert a MOTLYNode tree into a Tag tree with parent links.
+ */
+function hydrate(node, parent) {
+    if (isRef(node)) {
+        const { ups, refPath } = parseRefString(node.linkTo);
+        return new tags_1.RefTag(ups, refPath, parent);
+    }
+    const tag = new tags_1.Tag({}, parent);
+    if (node.eq !== undefined) {
+        if (Array.isArray(node.eq)) {
+            tag.eq = node.eq.map(el => hydrate(el, tag));
+        }
+        else if (node.eq instanceof Date) {
+            tag.eq = new Date(node.eq);
+        }
+        else {
+            tag.eq = node.eq;
+        }
+    }
+    if (node.properties !== undefined) {
+        tag.properties = {};
+        for (const [key, val] of Object.entries(node.properties)) {
+            tag.properties[key] = hydrate(val, tag);
+        }
+    }
+    if (node.deleted) {
+        tag.deleted = true;
+    }
+    return tag;
+}
+/**
+ * Session-based parser for Malloy tag language. Create an instance,
+ * call parse() for each line, then finish() to get the final Tag.
+ */
+class TagParser {
+    constructor() {
+        this.session = new motly_ts_parser_1.MOTLYSession();
+    }
+    parse(source) {
+        const stripped = stripPrefix(source);
+        const errors = this.session.parse(stripped);
+        const tagErrors = errors.map(mapMOTLYError);
+        const value = this.session.getValue();
+        return { tag: hydrate(value), log: tagErrors };
+    }
+    finish() {
+        const value = this.session.getValue();
+        this.session.dispose();
+        return hydrate(value);
+    }
+}
+exports.TagParser = TagParser;
+/**
+ * Parse Malloy tag language into a Tag which can be queried.
+ *
+ * @param source - A single string or array of strings to parse. If a string
+ *   starts with #, all characters up to the first space are skipped.
+ *   When an array is provided, strings are parsed sequentially and merged.
+ * @returns TagParse with the resulting tag and any errors. For arrays,
+ *   error line numbers indicate the index in the array where the error occurred.
+ */
+function parseTag(source) {
+    const session = new TagParser();
+    if (typeof source === 'string') {
+        return session.parse(source);
+    }
+    const allErrs = [];
+    for (let i = 0; i < source.length; i++) {
+        const result = session.parse(source[i]);
+        for (const err of result.log) {
+            allErrs.push({ ...err, line: i + err.line });
+        }
+    }
+    return { tag: session.finish(), log: allErrs };
+}
+//# sourceMappingURL=parser.js.map

package/dist/parser.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"parser.js","sourceRoot":"","sources":["../src/parser.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,9 +1,17 @@
 {
   "name": "@malloydata/malloy-tag",
-  "version": "0.0.339",
+  "version": "0.0.341",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
+  "files": [
+    "dist/**/*.js",
+    "dist/**/*.js.map",
+    "dist/**/*.d.ts",
+    "!dist/**/*.spec.*",
+    "src",
+    "!src/**/*.spec.*"
+  ],
   "homepage": "https://github.com/malloydata/malloy#readme",
   "engines": {
     "node": ">=20"
@@ -14,17 +22,16 @@
   },
   "scripts": {
     "test": "jest --config=../../jest.config.js",
-    "build-peggy": "mkdir -p src/peggy/dist && peggy -o src/peggy/dist/peg-tag-parser.js src/peggy/malloy-tag.peggy",
-    "clean": "tsc --build --clean && rm -f tsconfig.tsbuildinfo && rimraf @flowtyped && rm -rf src/peggy/dist",
-    "build": "npm run build-peggy && tsc --build && npm run generate-flow",
+    "clean": "rm -rf dist && tsc --build --clean && rm -f tsconfig.tsbuildinfo && rimraf @flowtyped",
+    "build": "tsc --build && npm run generate-flow",
     "prepublishOnly": "npm run clean && npm run build",
     "generate-flow": "ts-node ../../scripts/gen-flow.ts"
   },
   "dependencies": {
+    "@malloydata/motly-ts-parser": "^0.0.2",
     "assert": "^2.0.0"
   },
   "devDependencies": {
-    "peggy": "^4.2.0",
     "rimraf": "^6.0.1",
     "ts-node": "^10.9.2"
   }

package/src/index.ts

@@ -5,7 +5,5 @@
  * LICENSE file in the root directory of this source tree.
  */
 export * from './tags';
-export {parseTag} from './peggy';
+export {parseTag, TagParser} from './parser';
 export * as ParseUtil from './util';
-export {validateTag} from './schema';
-export type {SchemaError} from './schema';

package/src/parser.ts

@@ -0,0 +1,203 @@
+/*
+ * Copyright Contributors to the Malloy project
+ * SPDX-License-Identifier: MIT
+ */
+
+import type {MOTLYError, MOTLYNode} from '@malloydata/motly-ts-parser';
+import {MOTLYSession} from '@malloydata/motly-ts-parser';
+import {Tag, RefTag} from './tags';
+import type {TagParse, TagError, Path} from './tags';
+
+/**
+ * Strip the Malloy tag prefix (e.g., "# " or "#(docs) ") from source.
+ */
+function stripPrefix(source: string): string {
+  if (source[0] === '#') {
+    const skipTo = source.indexOf(' ');
+    if (skipTo > 0) {
+      return source.slice(skipTo);
+    }
+    return '';
+  }
+  return source;
+}
+
+/**
+ * Map a MOTLYError (from motly-ts parser) to a TagError.
+ */
+function mapMOTLYError(error: MOTLYError): TagError {
+  return {
+    code: error.code,
+    message: error.message,
+    line: error.begin.line,
+    offset: error.begin.column,
+  };
+}
+
+/**
+ * Parse a reference string like "$^^path.to[0].thing" back into
+ * structured form {ups, refPath}.
+ */
+function parseRefString(linkTo: string): {ups: number; refPath: Path} {
+  let i = 1;
+  let ups = 0;
+  while (i < linkTo.length && linkTo[i] === '^') {
+    ups++;
+    i++;
+  }
+
+  const refPath: Path = [];
+  const rest = linkTo.slice(i);
+
+  if (rest.length === 0) {
+    return {ups, refPath};
+  }
+
+  let pos = 0;
+  let needDot = false;
+
+  while (pos < rest.length) {
+    if (rest[pos] === '.') {
+      pos++;
+      needDot = false;
+      continue;
+    }
+
+    if (rest[pos] === '[') {
+      const close = rest.indexOf(']', pos);
+      refPath.push(Number(rest.slice(pos + 1, close)));
+      pos = close + 1;
+      needDot = true;
+      continue;
+    }
+
+    if (needDot) {
+      // Expected a dot separator but didn't get one
+    }
+
+    if (rest[pos] === '`') {
+      pos++;
+      let seg = '';
+      while (pos < rest.length && rest[pos] !== '`') {
+        if (rest[pos] === '\\') {
+          pos++;
+          seg += rest[pos];
+        } else {
+          seg += rest[pos];
+        }
+        pos++;
+      }
+      pos++;
+      refPath.push(seg);
+      needDot = true;
+      continue;
+    }
+
+    let seg = '';
+    while (
+      pos < rest.length &&
+      rest[pos] !== '.' &&
+      rest[pos] !== '[' &&
+      rest[pos] !== '`'
+    ) {
+      seg += rest[pos];
+      pos++;
+    }
+    if (seg.length > 0) {
+      refPath.push(seg);
+      needDot = true;
+    }
+  }
+
+  return {ups, refPath};
+}
+
+function isRef(node: MOTLYNode): node is {linkTo: string} {
+  return 'linkTo' in node;
+}
+
+/**
+ * Convert a MOTLYNode tree into a Tag tree with parent links.
+ */
+function hydrate(node: MOTLYNode, parent?: Tag): Tag {
+  if (isRef(node)) {
+    const {ups, refPath} = parseRefString(node.linkTo);
+    return new RefTag(ups, refPath, parent);
+  }
+
+  const tag = new Tag({}, parent);
+
+  if (node.eq !== undefined) {
+    if (Array.isArray(node.eq)) {
+      tag.eq = node.eq.map(el => hydrate(el, tag));
+    } else if (node.eq instanceof Date) {
+      tag.eq = new Date(node.eq);
+    } else {
+      tag.eq = node.eq;
+    }
+  }
+
+  if (node.properties !== undefined) {
+    tag.properties = {};
+    for (const [key, val] of Object.entries(node.properties)) {
+      tag.properties[key] = hydrate(val, tag);
+    }
+  }
+
+  if (node.deleted) {
+    tag.deleted = true;
+  }
+
+  return tag;
+}
+
+/**
+ * Session-based parser for Malloy tag language. Create an instance,
+ * call parse() for each line, then finish() to get the final Tag.
+ */
+export class TagParser {
+  private session: MOTLYSession;
+
+  constructor() {
+    this.session = new MOTLYSession();
+  }
+
+  parse(source: string): TagParse {
+    const stripped = stripPrefix(source);
+    const errors = this.session.parse(stripped);
+    const tagErrors = errors.map(mapMOTLYError);
+    const value = this.session.getValue();
+    return {tag: hydrate(value), log: tagErrors};
+  }
+
+  finish(): Tag {
+    const value = this.session.getValue();
+    this.session.dispose();
+    return hydrate(value);
+  }
+}
+
+/**
+ * Parse Malloy tag language into a Tag which can be queried.
+ *
+ * @param source - A single string or array of strings to parse. If a string
+ *   starts with #, all characters up to the first space are skipped.
+ *   When an array is provided, strings are parsed sequentially and merged.
+ * @returns TagParse with the resulting tag and any errors. For arrays,
+ *   error line numbers indicate the index in the array where the error occurred.
+ */
+export function parseTag(source: string | string[]): TagParse {
+  const session = new TagParser();
+  if (typeof source === 'string') {
+    return session.parse(source);
+  }
+
+  const allErrs: TagError[] = [];
+  for (let i = 0; i < source.length; i++) {
+    const result = session.parse(source[i]);
+    for (const err of result.log) {
+      allErrs.push({...err, line: i + err.line});
+    }
+  }
+  return {tag: session.finish(), log: allErrs};
+}

package/CONTEXT.md

@@ -1,173 +0,0 @@
-# Malloy Tag Language (MOTLY)
-
-The Malloy Tag Language (also called MOTLY - Malloy Object Tagging Language) is a concise, readable syntax for adding structured metadata to Malloy objects through annotations. It's designed to work seamlessly with Malloy's annotation system and can also be used as a standalone configuration language.
-
-## Purpose
-
-While Malloy annotations can contain arbitrary text, the Tag Language provides a standardized way to express structured metadata that is:
-- Human-readable and writable
-- Easy to parse programmatically
-- Flexible enough for various use cases
-- Concise and unobtrusive in code
-
-## Syntax Overview
-
-The Tag Language supports several data types:
-
-### Boolean Tags
-```malloy
-# hidden
-```
-A tag name without a value is a boolean (implicitly `true`).
-
-### Typed Values
-Values prefixed with `@` are typed:
-```malloy
-# enabled=@true
-# debug=@false
-# created=@2024-01-15
-# updated=@2024-01-15T10:30:00Z
-```
-
-### String Values
-```malloy
-# color=blue
-# name="User Name"
-# description="""
-Multi-line string
-with preserved newlines.
-"""
-```
-Unquoted strings for simple values (alphanumeric and underscore), quoted strings for values with spaces or special characters, triple-quoted for multi-line.
-
-### Numeric Values
-```malloy
-# size=10
-# width=100.5
-# rate=-0.05
-```
-Numbers are automatically parsed as numeric types.
-
-### Arrays
-```malloy
-# colors=[red, green, blue]
-# ports=[80, 443, 8080]
-# users=[{ name=alice role=admin }, { name=bob role=user }]
-```
-
-### Nested Properties
-```malloy
-# box: { width=100 height=200 }
-```
-Colon and curly braces create nested property groups.
-
-### Deep Path Notation
-```malloy
-# database.connection.pool.max=100
-```
-Dot notation for setting nested values directly.
-
-### Delete Property
-```malloy
-# -deprecated_field
-```
-Minus prefix removes a property.
-
-### Combined Example
-```malloy
-#(myApp) hidden color=blue size=10 box: { width=100 height=200 } name="Blue Thing"
-```
-
-## Colon vs Space Syntax
-
-Two ways to add properties to objects with different semantics:
-
-**Colon syntax (`: { }`) replaces all properties:**
-```malloy
-# server: { host=localhost port=8080 }
-# server: { url="http://example.com" }  # Replaces - only url remains
-```
-
-**Space syntax (`{ }`) merges with existing properties:**
-```malloy
-# server: { host=localhost }
-# server { port=8080 }  # Merges - both host and port exist
-```
-
-## Annotation Prefixes
-
-Different prefixes are used to avoid collision between different uses of annotations:
-
-- **`# `** (hash-space) - Reserved for Malloy renderer
-- **`#!`** - Compiler directives
-- **`#(docs)`** - Malloy documentation
-- **`#(appName) `** - Encouraged pattern for application-specific tags
-
-Example with application prefix:
-```malloy
-#(myApp) visible theme=dark priority=high
-```
-
-## Multi-line Annotations
-
-The tag language works with single-line annotations. For multi-line text that is NOT in the tag language:
-
-```malloy
-#" This is a multi-line string annotation
-#" which is NOT in the tag language
-#" but could be displayed as help text
-source: name is VALUE
-```
-
-## Usage Pattern
-
-The expected workflow for using tag annotations:
-
-1. **Write annotations** in Malloy code using tag syntax
-2. **Query annotations** from compiled model using pattern matching (filter by prefix)
-3. **Parse tags** using the malloy-tag package
-4. **Extract values** and use in your application
-
-## Implementation
-
-The `malloy-tag` package provides:
-- **Peggy-based parser** for tag language syntax
-- **Tag class** with methods for type-safe value access
-- **Type definitions** for parsed tag structures
-
-### Key API Methods
-
-```typescript
-import {Tag} from '@malloydata/malloy-tag';
-
-const {tag, log} = Tag.parse('enabled=@true port=8080 name="My App"');
-
-// Convert to plain JavaScript object
-const obj = tag.toObject();  // { enabled: true, port: 8080, name: "My App" }
-
-// Type-safe accessors
-tag.text('name');           // "My App"
-tag.numeric('port');        // 8080
-tag.boolean('enabled');     // true
-tag.isTrue('enabled');      // true
-tag.date('created');        // Date object
-tag.textArray('features');  // string[]
-tag.has('name');            // true
-
-// Nested access
-tag.text('server', 'host');
-tag.tag('server');          // Get nested Tag object
-```
-
-## Documentation
-
-For complete tag language syntax and examples, see:
-- `docs/motly.md` in this package (comprehensive reference)
-- https://docs.malloydata.dev/documentation/language/tags
-
-## Important Notes
-
-- Not all annotations use the tag language - raw text is also valid
-- The tag language is optional - annotations can be simple strings
-- Each application defines its own conventions for tag usage
-- Tags are metadata only - they don't affect query execution

package/dist/peggy/dist/peg-tag-parser.d.ts

@@ -1,11 +0,0 @@
-declare function peg$SyntaxError(message: any, expected: any, found: any, location: any): Error;
-declare class peg$SyntaxError {
-    constructor(message: any, expected: any, found: any, location: any);
-    format(sources: any): string;
-}
-declare namespace peg$SyntaxError {
-    function buildMessage(expected: any, found: any): string;
-}
-declare function peg$parse(input: any, options: any): any;
-export declare let StartRules: string[];
-export { peg$SyntaxError as SyntaxError, peg$parse as parse };