update

Author: rjrodger

jest.config.js

@@ -1,6 +1,8 @@
-/** @type {import('@ts-jest/dist/types').InitialOptionsTsJest} */
 module.exports = {
-  preset: 'ts-jest',
+  transform: {
+    "^.+\\.tsx?$": "es-jest"
+  },
   testEnvironment: 'node',
-  testMatch: ['**/test/**/*.test.ts']
-};
+  testMatch: ['**/test/**/*.test.ts'],
+  watchPathIgnorePatterns: ['.*.js$'],
+}

jsonc.d.ts

@@ -1,5 +1,5 @@
-import { Jsonic } from 'jsonic';
-declare type JsoncOptions = {
+import { Jsonic } from '@jsonic/jsonic-next';
+type JsoncOptions = {
     allowTrailingComma?: boolean;
     disallowComments?: boolean;
 };

jsonc.js

@@ -1,4 +1,11 @@
-import { Jsonic } from 'jsonic'
+/* Copyright (c) 2021-2023 Richard Rodger, MIT License */
+
+// Import Jsonic types used by plugin.
+import {
+  Jsonic,
+  RuleSpec,
+} from '@jsonic/jsonic-next'
+
 
 type JsoncOptions = {
   allowTrailingComma?: boolean
@@ -15,6 +22,7 @@ function Jsonc(jsonic: Jsonic, options: JsoncOptions) {
       oct: false,
       bin: false,
       sep: null,
+      exclude: /^\./
     },
     string: {
       chars: '"',
@@ -35,9 +43,20 @@ function Jsonc(jsonic: Jsonic, options: JsoncOptions) {
     },
     rule: {
       finish: false,
-      include: 'json' + (options.allowTrailingComma ? ',comma' : ''),
+      include: 'jsonc,json' + (options.allowTrailingComma ? ',comma' : ''),
     },
   })
+
+  const { ZZ } = jsonic.token
+
+  jsonic.rule('val', (rs: RuleSpec) => {
+    rs.open([
+      {
+        s: [ZZ],
+        g: 'jsonc'
+      }
+    ])
+  })
 }
 
 export { Jsonc }

jsonc.js.map

@@ -1,12 +1,12 @@
 {
   "name": "@jsonic/jsonc",
   "version": "0.0.2",
-  "description": "Jsonic plugin for the JSONC variant of JSON.",
+  "description": "This plugin allows the [Jsonic](https://jsonic.senecajs.org) JSON parser to support JSONC syntax.",
   "main": "jsonc.js",
   "type": "commonjs",
   "browser": "jsonc.min.js",
   "types": "jsonc.d.ts",
-  "homepage": "https://github.com/jsonicjs/variant-jsonc",
+  "homepage": "https://github.com/jsonicjs/jsonc",
   "keywords": [
     "pattern",
     "matcher",
@@ -17,7 +17,7 @@
   "author": "Richard Rodger (http://richardrodger.com)",
   "repository": {
     "type": "git",
-    "url": "git://github.com/jsonicjs/variant-jsonc.git"
+    "url": "git://github.com/jsonicjs/jsonc.git"
   },
   "scripts": {
     "test": "jest --coverage",
@@ -27,7 +27,7 @@
     "build": "tsc -d && cp jsonc.js jsonc.min.js && browserify -o jsonc.min.js -e jsonc.js -s @JsonicJsonc -im -i assert -p tinyify",
     "prettier": "prettier --write --no-semi --single-quote *.ts test/*.js",
     "clean": "rm -rf node_modules yarn.lock package-lock.json",
-    "reset": "npm run clean && npm i && npm test",
+    "reset": "npm run clean && npm i && npm run build && npm test",
     "repo-tag": "REPO_VERSION=`node -e \"console.log(require('./package').version)\"` && echo TAG: v$REPO_VERSION && git commit -a -m v$REPO_VERSION && git push && git tag v$REPO_VERSION && git push --tags;",
     "repo-publish": "npm run clean && npm i && npm run repo-publish-quick",
     "repo-publish-quick": "npm run prettier && npm run build && npm run test && npm run repo-tag && npm publish --access public --registry http://registry.npmjs.org "
@@ -40,17 +40,17 @@
     "LICENSE"
   ],
   "devDependencies": {
-    "@types/jest": "^27.0.1",
+    "@types/jest": "^29.4.0",
     "browserify": "^17.0.0",
-    "hapi-lab-shim": "0.0.2",
-    "jest": "^27.1.1",
-    "lab-transform-typescript": "^3.0.1",
-    "prettier": "^2.4.0",
-    "tinyify": "^3.0.0",
-    "ts-jest": "^27.0.5",
-    "typescript": "^4.4.2",
-    "jsonc-parser": "^3.0.0",
-    "jsonic": "github:jsonicjs/jsonic#nextgen"
+    "jest": "^29.4.1",
+    "prettier": "^2.8.3",
+    "tinyify": "^4.0.0",
+    "typescript": "^4.9.5",
+    "es-jest": "^2.1.0",
+    "esbuild": "^0.17.5"
   },
-  "dependencies": {}
+  "dependencies": {},
+  "peerDependencies": {
+    "@jsonic/jsonic-next": ">=2.7.0"
+  }
 }