@malloydata/malloy-sql 0.0.65 → 0.0.66-dev230803195842

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -10,4 +10,5 @@ export interface MalloySQLParse {
10
10
  statements: MalloySQLStatement[];
11
11
  errors: MalloySQLParseError[];
12
12
  initialCommentsLineCount?: number;
13
+ initialComments?: string;
13
14
  }
@@ -101,7 +101,8 @@ class MalloySQLParser {
101
101
  }
102
102
  let previousConnection = '';
103
103
  const statements = [];
104
- const initialCommentsLineCount = parsed.initialComments.split(/\r\n|\r|\n/).length - 1;
104
+ const { initialComments } = parsed;
105
+ const initialCommentsLineCount = initialComments.split(/\r\n|\r|\n/).length - 1;
105
106
  let statementIndex = 0;
106
107
  const errors = [];
107
108
  if (!parsed.statements)
@@ -163,6 +164,7 @@ class MalloySQLParser {
163
164
  statements,
164
165
  errors,
165
166
  initialCommentsLineCount,
167
+ initialComments,
166
168
  };
167
169
  }
168
170
  }
@@ -1 +1 @@
1
- {"version":3,"file":"malloySQLParser.js","sourceRoot":"","sources":["../src/malloySQLParser.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"malloySQLParser.js","sourceRoot":"","sources":["../src/malloySQLParser.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@malloydata/malloy-sql",
3
- "version": "0.0.65",
3
+ "version": "0.0.66-dev230803195842",
4
4
  "license": "MIT",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -21,7 +21,7 @@
21
21
  "prepublishOnly": "npm run build"
22
22
  },
23
23
  "dependencies": {
24
- "@malloydata/malloy": "^0.0.65"
24
+ "@malloydata/malloy": "^0.0.66-dev230803195842"
25
25
  },
26
26
  "devDependencies": {
27
27
  "peggy": "^3.0.2"