@panagos/jojoscript 0.7.0 → 0.7.1

package/README.md

@@ -1,4 +1,4 @@
-# JojoScript 0.7.0
+# JojoScript 0.7.1
 
 JojoScript is a deliberately small source-to-source language that adds a
 handful of ergonomic constructs on top of JavaScript while keeping ordinary
@@ -13,7 +13,7 @@ every feature described below.
 ## Install
 
 ```bash
-npm install jojoscript
+npm install @panagos/jojoscript
 ```
 
 ## CLI
@@ -252,11 +252,11 @@ return ids
 ```
 
 `await`, `catch`, and `orElse` are resolved at compile time and are never
-added to the automatic `jojoscript/runtime` import.
+added to the automatic `@panagos/jojoscript/runtime` import.
 
 ### Standard pipeline runtime
 
-The following pipeline stages are supplied by `jojoscript/runtime`. The
+The following pipeline stages are supplied by `@panagos/jojoscript/runtime`. The
 compiler automatically generates only the runtime imports that are actually
 used through pipeline syntax (custom/user-defined stages are never
 auto-imported):
@@ -336,12 +336,12 @@ import axios from "axios"
 Generated JavaScript imports the runtime using the package subpath:
 
 ```js
-import { map, take } from "jojoscript/runtime"
+import { map, take } from "@panagos/jojoscript/runtime"
 ```
 
 The package exposes this through `package.json` `exports`, so consumers
 install `jojoscript` as a normal dependency. If a file both manually imports
-from `jojoscript/runtime` (for a stage that's only ever called directly,
+from `@panagos/jojoscript/runtime` (for a stage that's only ever called directly,
 never through `|>`) and also uses pipeline syntax with overlapping names,
 the compiler merges the auto-imported names into the existing import
 instead of emitting a second, colliding import declaration.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@panagos/jojoscript",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "A tiny JavaScript-compatible language layer with Jojo syntax and pipelines.",
   "license": "Unlicense",
   "type": "module",

package/src/compiler.js

@@ -1,5 +1,6 @@
 import fs from 'node:fs'
 import path from 'node:path'
+import { fileURLToPath } from 'node:url'
 
 import {
   transformPipelines,
@@ -19,7 +20,17 @@ import {
 import { transformMatchExpressions } from './match-parser.js'
 import { transformTypeAnnotations } from './type-annotations.js'
 
-const JOJO_RUNTIME = 'jojoscript/runtime'
+/*
+ * The auto-generated runtime import must use whatever name this package is
+ * actually installed under (e.g. a scoped fork like "@me/jojoscript"), not a
+ * hardcoded literal, so it's derived from this package's own package.json
+ * instead of being hardcoded.
+ */
+const PACKAGE_ROOT = path.join(path.dirname(fileURLToPath(import.meta.url)), '..')
+const OWN_PACKAGE_NAME = JSON.parse(
+  fs.readFileSync(path.join(PACKAGE_ROOT, 'package.json'), 'utf8')
+).name
+const JOJO_RUNTIME = `${OWN_PACKAGE_NAME}/runtime`
 
 export function compile(source) {
   let result = source
@@ -81,7 +92,13 @@ export function compile(source) {
   return result.endsWith('\n') ? result : result + '\n'
 }
 
-const RUNTIME_IMPORT_PATTERN = /import\s*\{([^}]*)\}\s*from\s*(["'])jojoscript\/runtime\2/
+const RUNTIME_IMPORT_PATTERN = new RegExp(
+  `import\\s*\\{([^}]*)\\}\\s*from\\s*(["'])${escapeRegExp(JOJO_RUNTIME)}\\2`
+)
+
+function escapeRegExp(value) {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+}
 
 function mergeRuntimeImport(source, stdlibFunctions) {
   const existing = source.match(RUNTIME_IMPORT_PATTERN)