Skip to content

Commit 506aa86

Browse files
committed
wip: migrating towards ESM
1 parent ef0bdfe commit 506aa86

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+519
-483
lines changed

local.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
#!/bin/sh
22

3-
tmp=`mktemp`
3+
tmp=`mktemp`.js
44

55
$TROUPE/bin/troupec $1 --output=$tmp
6+
67
if [ $? -eq 0 ]; then
7-
node --stack-trace-limit=1000 $TROUPE/rt/built/troupe.js -f=$tmp --localonly #--debug
8+
node --stack-trace-limit=1000 $TROUPE/rt/built/troupe.mjs -f=$tmp --localonly #--debug
89
rm $tmp
910
else
1011
exit $?

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
"license": "ISC",
1616
"dependencies": {
1717
"@nodeutils/defaults-deep": "^1.1.0",
18-
"chalk": "^4.1.0",
18+
"@types/node": "^18.15.3",
19+
"chalk": "^5.2.0",
1920
"find-free-port": "^2.0.0",
2021
"it-length-prefixed": "^3.0.1",
2122
"it-pipe": "^1.1.0",

rt/src/Asserts.ts renamed to rt/src/Asserts.mts

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
1-
import { Thread, Capability } from './Thread';
1+
import { Thread, Capability } from './Thread.mjs';
22

3-
const { isListFlagSet, isTupleFlagSet } = require('./ValuesUtil.js');
4-
const proc = require('./process.js');
3+
import { isListFlagSet, isTupleFlagSet } from './ValuesUtil.mjs';
4+
import * as proc from './process.mjs';
55
const ProcessID = proc.ProcessID;
6-
import { Level } from './Level';
7-
import { Authority } from './Authority'
8-
import options = require('./options.js');
9-
import { TroupeType } from './TroupeTypes';
10-
const levels = options;
6+
import { Level } from './Level.mjs';
7+
import { Authority } from './Authority.mjs'
8+
import * as levels from './options.mjs';
9+
import { TroupeType } from './TroupeTypes.mjs';
1110
const flowsTo = levels.flowsTo;
1211

13-
import { getRuntimeObject } from './SysState';
14-
import { __nodeManager } from './NodeManager';
15-
import { TroupeAggregateRawValue, TroupeRawValue } from './TroupeRawValue';
16-
import { LVal } from './Lval';
12+
import { getRuntimeObject } from './SysState.mjs';
13+
import { __nodeManager } from './NodeManager.mjs';
14+
import { TroupeAggregateRawValue, TroupeRawValue } from './TroupeRawValue.mjs';
15+
// import { LVal } from './Lval';
1716

1817
function _thread() {
1918
return getRuntimeObject().__sched.__currentThread

rt/src/Atom.ts renamed to rt/src/Atom.mts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import runId from "./runId"
2-
import { TroupeType } from "./TroupeTypes"
3-
import { TroupeRawValue } from "./TroupeRawValue";
4-
import levels = require ('./options')
1+
import runId from "./runId.mjs"
2+
import { TroupeType } from "./TroupeTypes.mjs"
3+
import { TroupeRawValue } from "./TroupeRawValue.mjs";
4+
import * as levels from './options.mjs'
55

66
let rt_uuid = runId
77

rt/src/Authority.ts renamed to rt/src/Authority.mts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { Level } from "./Level";
2-
import { BOT } from "./options";
1+
import { Level } from "./Level.mjs";
2+
import { BOT } from "./options.mjs";
33

4-
import { TroupeRawValue } from "./TroupeRawValue";
5-
import { TroupeType } from "./TroupeTypes";
4+
import { TroupeRawValue } from "./TroupeRawValue.mjs";
5+
import { TroupeType } from "./TroupeTypes.mjs";
66

77
export class Authority implements TroupeRawValue {
88
authorityLevel: Level;

rt/src/BaseFunction.ts renamed to rt/src/BaseFunction.mts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import {ClosureType, TroupeType} from './TroupeTypes'
2-
import {TroupeAggregateRawValue} from './TroupeRawValue'
3-
import levels from './options'
4-
import { getRuntimeObject } from './SysState'
1+
import {ClosureType, TroupeType} from './TroupeTypes.mjs'
2+
import {TroupeAggregateRawValue} from './TroupeRawValue.mjs'
3+
import * as levels from './options.mjs'
4+
import { getRuntimeObject } from './SysState.mjs'
55

66
export function BaseFunctionWithExplicitArg(f, name = null) : TroupeAggregateRawValue{
77

rt/src/EqualityChecker.ts renamed to rt/src/EqualityChecker.mts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import {TroupeType} from './TroupeTypes'
2-
import {LVal} from './Lval'
3-
const proc = require('./process.js');
4-
import levels = require ('./options')
1+
import {TroupeType} from './TroupeTypes.mjs'
2+
import {LVal} from './Lval.mjs'
3+
import * as proc from './process.mjs'
4+
import * as levels from './options.mjs'
55

66

77

rt/src/Level.ts renamed to rt/src/Level.mts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { TroupeType } from "./TroupeTypes";
2-
import { TroupeRawValue } from "./TroupeRawValue";
1+
import { TroupeType } from "./TroupeTypes.mjs";
2+
import { TroupeRawValue } from "./TroupeRawValue.mjs";
33
// import levels from './options';
44

55
export abstract class Level implements TroupeRawValue {

rt/src/LocalObject.ts renamed to rt/src/LocalObject.mts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import {TroupeType} from './TroupeTypes'
2-
import {TroupeRawValue} from './TroupeRawValue'
3-
import levels from './options'
1+
import {TroupeType} from './TroupeTypes.mjs'
2+
import {TroupeRawValue} from './TroupeRawValue.mjs'
3+
import * as levels from './options.mjs'
44

55
export class LocalObject implements TroupeRawValue {
66
_troupeType : TroupeType

rt/src/Lval.ts renamed to rt/src/Lval.mts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import levels = require ('./options')
2-
import { Level } from "./Level";
3-
import * as Ty from './TroupeTypes';
4-
import { TroupeRawValue } from './TroupeRawValue';
1+
import * as levels from './options.mjs'
2+
import { Level } from "./Level.mjs";
3+
import * as Ty from './TroupeTypes.mjs';
4+
import { TroupeRawValue } from './TroupeRawValue.mjs';
55

66
export class LVal implements TroupeRawValue{
77
val: any;

0 commit comments

Comments
 (0)