Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

<body>
<script type="module">
import "qunit/qunit/qunit.js";
import { runTests } from "@glimmer-workspace/integration-tests";
await runTests(
import.meta.glob("./packages/{@glimmer,@glimmer-workspace}/*/test/**/*-test.ts"),
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"@glimmer-workspace/eslint-plugin": "workspace:*",
"@glimmer-workspace/integration-tests": "workspace:*",
"@glimmer-workspace/repo-metadata": "workspace:*",
"@glimmer/env": "0.1.7",
"@glimmer/env": "workspace:*",
"@rollup/plugin-sucrase": "^5.0.2",
"@rollup/plugin-terser": "^0.4.4",
"@tsconfig/strictest": "^2.0.5",
Expand Down Expand Up @@ -135,13 +135,13 @@
},
"overrides": {
"@glimmer/syntax": "workspace:*",
"@oclif/plugin-warn-if-update-available": "^3.1.42",
"@rollup/pluginutils": "^5.0.2",
"@types/node": "$@types/node",
"typescript": "$typescript",
"@oclif/plugin-warn-if-update-available": "^3.1.42",
"d3-color": "^3.1.0",
"esbuild": "^0.25.0",
"got": "^11.8.5"
"got": "^11.8.5",
"typescript": "$typescript"
},
"peerDependencyRules": {
"allowAny": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
import type { Expand } from '@glimmer/interfaces';
import type { Runner } from 'js-reporters';
import { debug } from '@glimmer/validator';
import { autoRegister } from 'js-reporters';
import { default as QUnit } from 'qunit';

const SMOKE_TEST_FILE = './packages/@glimmer-workspace/integration-tests/test/smoke-test.ts';

Expand Down Expand Up @@ -31,7 +29,7 @@ export async function bootQunit(
}

export async function setupQunit() {
const qunitLib: QUnit = await import('qunit');
const qunitLib: QUnit = QUnit;
await import('qunit/qunit/qunit.css');

const testing = Testing.withConfig(
Expand Down Expand Up @@ -72,10 +70,11 @@ export async function setupQunit() {
}
);

const runner = autoRegister();

testing.begin(() => {
if (testing.config.ci) {
// @ts-expect-error TODO: js-reporters not available
const runner = autoRegister();

// @ts-expect-error add reporters.tap to the types

const tap = qunitLib.reporters.tap as {
Expand Down
1 change: 0 additions & 1 deletion packages/@glimmer-workspace/integration-tests/lib/setup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import type { IteratorDelegate } from '@glimmer/reference';
import type { TestBase } from 'qunit';
import setGlobalContext from '@glimmer/global-context';
import { consumeTag, dirtyTagFor, tagFor } from '@glimmer/validator';
import QUnit from 'qunit';

import { scheduleDidDestroy, scheduleWillDestroy } from './base-env';
import { NativeIteratorDelegate } from './modes/env';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,2 @@
import { trackedData } from '@glimmer/validator';

export function tracked(target: object, key: string) {
let { getter, setter } = trackedData<any, any>(key);

Object.defineProperty(target, key, {
get() {
return getter(this);
},

set(value: unknown) {
setter(this, value);
},
});
}
// TODO: lets point everybody who uses this directly at @glimmer/tracking
export { tracked } from '@glimmer/tracking';
1 change: 1 addition & 0 deletions packages/@glimmer-workspace/integration-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"@glimmer/reference": "workspace:*",
"@glimmer/runtime": "workspace:*",
"@glimmer/syntax": "workspace:*",
"@glimmer/tracking": "workspace:*",
"@glimmer/util": "workspace:*",
"@glimmer/validator": "workspace:*",
"@glimmer/vm": "workspace:*",
Expand Down
6 changes: 4 additions & 2 deletions packages/@glimmer/compiler/lib/compiler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,13 @@ interface Crypto {
}

export const defaultId: TemplateIdFn = (() => {
/* prettier-ignore */
const req = (
// @ts-expect-error using node API here, but only here
typeof module === 'object' && typeof module.require === 'function'
? // eslint-disable-next-line @typescript-eslint/unbound-method
? // @ts-expect-error using node API here, but only here
module.require
: globalThis.require
: (globalThis as any).require
) as typeof require | undefined;

if (req) {
Expand Down
2 changes: 0 additions & 2 deletions packages/@glimmer/compiler/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@
"@glimmer/wire-format": "workspace:*"
},
"devDependencies": {
"@glimmer-workspace/build-support": "workspace:*",
"@glimmer-workspace/env": "workspace:*",
"@glimmer/constants": "workspace:*",
"@glimmer/debug": "workspace:*",
"@glimmer/debug-util": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/@glimmer/constants/test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"version": "0.92.0",
"scripts": {},
"dependencies": {
"@glimmer/env": "0.1.7",
"@glimmer/env": "workspace:*",
"@glimmer/util": "workspace:*"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/@glimmer/debug-util/lib/debug-to-string.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { AnyFn } from '@glimmer/interfaces';

let debugToString: undefined | ((value: unknown) => string);

if (import.meta.env.DEV) {
if (import.meta.env?.DEV) {
let getFunctionName = (fn: AnyFn) => {
let functionName = fn.name;

Expand Down
2 changes: 1 addition & 1 deletion packages/@glimmer/debug-util/test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"version": "0.92.0",
"scripts": {},
"dependencies": {
"@glimmer/env": "0.1.7",
"@glimmer/env": "workspace:*",
"@glimmer/util": "workspace:*"
},
"devDependencies": {
Expand Down
3 changes: 1 addition & 2 deletions packages/@glimmer/debug/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
export type { DebugOp, SomeDisassembledOperand } from './lib/debug';
export { debugOp, describeOpcode, logOpcodeSlice } from './lib/debug';
export { describeOp } from './lib/dism/opcode';
export { debugOp, describeOpcode, logOpcodeSlice, describeOp } from './lib/debug';
export {
buildEnum,
buildMetas,
Expand Down
66 changes: 19 additions & 47 deletions packages/@glimmer/debug/lib/debug.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,28 @@ import { $fp, $pc, $ra, $s0, $s1, $sp, $t0, $t1, $v0 } from '@glimmer/vm';
import type { Primitive, RegisterName } from './dism/dism';
import type { NormalizedOperand, OperandType, ShorthandOperand } from './dism/operand-types';

import { describeOp } from './dism/opcode';
import { OPERANDS } from './dism/operands';
import { opcodeMetadata } from './opcode-metadata';
import { frag } from './render/fragment';
import { frag, type Fragment, as, type IntoFragment } from './render/fragment';
import { DebugLogger } from './render/logger';
import { SerializeBlockContext } from './dism/opcode';
import { join } from './render/basic';

export function describeOp(
op: RuntimeOp,
program: Program,
meta: Nullable<BlockMetadata>
): Fragment {
const { name, params } = debugOp(program, op, meta);

const block = new SerializeBlockContext(meta?.symbols ?? null);

let args: IntoFragment[] = Object.entries(params).map(
([p, v]) => frag`${as.attrName(p)}=${block.serialize(v)}`
);

return frag`(${join([as.kw(name), ...args], ' ')})`;
}

export function logOpcodeSlice(context: CompilationContext, start: number, end: number) {
if (LOCAL_TRACE_LOGGING) {
Expand Down Expand Up @@ -405,48 +422,3 @@ function fromRaw(operands: Dict<RawDisassembledOperand>): Dict<SomeDisassembledO
Object.entries(operands).map(([name, raw]) => [name, DisassembledOperand.of(raw)])
);
}

export function decodeCurry(curry: number): 'component' | 'helper' | 'modifier' {
switch (curry) {
case CURRIED_COMPONENT:
return 'component';
case CURRIED_HELPER:
return 'helper';
case CURRIED_MODIFIER:
return 'modifier';
default:
throw Error(`Unexpected curry value: ${curry}`);
}
}

export function decodeRegister(register: number): RegisterName {
switch (register) {
case $pc:
return '$pc';
case $ra:
return '$ra';
case $fp:
return '$fp';
case $sp:
return '$sp';
case $s0:
return '$s0';
case $s1:
return '$s1';
case $t0:
return '$t0';
case $t1:
return '$t1';
case $v0:
return '$v0';
default:
return `$bug${register}`;
}
}

export function decodePrimitive(primitive: number, constants: ProgramConstants): Primitive {
if (primitive >= 0) {
return constants.getValue(decodeHandle(primitive));
}
return decodeImmediate(primitive);
}
56 changes: 56 additions & 0 deletions packages/@glimmer/debug/lib/decoders.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
import type { ProgramConstants } from '@glimmer/interfaces';
import {
CURRIED_COMPONENT,
CURRIED_HELPER,
CURRIED_MODIFIER,
decodeHandle,
decodeImmediate,
} from '@glimmer/constants';
import { $fp, $pc, $ra, $s0, $s1, $sp, $t0, $t1, $v0 } from '@glimmer/vm';

import type { Primitive, RegisterName } from './dism/dism';

export function decodeCurry(curry: number): 'component' | 'helper' | 'modifier' {
switch (curry) {
case CURRIED_COMPONENT:
return 'component';
case CURRIED_HELPER:
return 'helper';
case CURRIED_MODIFIER:
return 'modifier';
default:
throw Error(`Unexpected curry value: ${curry}`);
}
}

export function decodeRegister(register: number): RegisterName {
switch (register) {
case $pc:
return '$pc';
case $ra:
return '$ra';
case $fp:
return '$fp';
case $sp:
return '$sp';
case $s0:
return '$s0';
case $s1:
return '$s1';
case $t0:
return '$t0';
case $t1:
return '$t1';
case $v0:
return '$v0';
default:
return `$bug${register}`;
}
}

export function decodePrimitive(primitive: number, constants: ProgramConstants): Primitive {
if (primitive >= 0) {
return constants.getValue(decodeHandle(primitive));
}
return decodeImmediate(primitive);
}
20 changes: 0 additions & 20 deletions packages/@glimmer/debug/lib/dism/opcode.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
import type { ClassifiedLocalDebug, ClassifiedLocalDebugFor } from '@glimmer/debug-util';
import type {
AppendingBlock,
BlockMetadata,
BlockSymbolNames,
Cursor,
NamedArguments,
Nullable,
PositionalArguments,
Program,
RuntimeOp,
VMArguments,
} from '@glimmer/interfaces';
import { dev, exhausted, getLocalDebugType } from '@glimmer/debug-util';
Expand All @@ -19,27 +16,10 @@ import type { ValueRefOptions } from '../render/basic';
import type { IntoFragment } from '../render/fragment';
import type { RegisterName, SomeDisassembledOperand } from './dism';

import { debugOp } from '../debug';
import { empty, join, unknownValue, value } from '../render/basic';
import { array } from '../render/combinators';
import { as, frag, Fragment } from '../render/fragment';

export function describeOp(
op: RuntimeOp,
program: Program,
meta: Nullable<BlockMetadata>
): Fragment {
const { name, params } = debugOp(program, op, meta);

const block = new SerializeBlockContext(meta?.symbols ?? null);

let args: IntoFragment[] = Object.entries(params).map(
([p, v]) => frag`${as.attrName(p)}=${block.serialize(v)}`
);

return frag`(${join([as.kw(name), ...args], ' ')})`;
}

export class SerializeBlockContext {
readonly #symbols: Nullable<BlockSymbolNames>;

Expand Down
2 changes: 1 addition & 1 deletion packages/@glimmer/debug/lib/dism/operands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import type {
OperandType,
} from './operand-types';

import { decodeCurry, decodePrimitive, decodeRegister } from '../debug';
import { decodeCurry, decodePrimitive, decodeRegister } from '../decoders';

interface DisassemblyState {
readonly offset: number;
Expand Down
2 changes: 1 addition & 1 deletion packages/@glimmer/debug/lib/stack-check.ts
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ function defaultMessage(value: unknown, expected: string): string {
return `Got ${value}, expected:\n${expected}`;
}

/*@__PURE__*/
/*@__NO_SIDE_EFFECTS__*/
export function check<T>(
value: unknown,
checker: Checker<T>,
Expand Down
2 changes: 1 addition & 1 deletion packages/@glimmer/debug/lib/vm/snapshot.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { $fp, $pc } from '@glimmer/vm';

import type { Fragment } from '../render/fragment';

import { decodeRegister } from '../debug';
import { decodeRegister } from '../decoders';
import { value } from '../render/basic';
import { array } from '../render/combinators';
import { as, frag } from '../render/fragment';
Expand Down
2 changes: 0 additions & 2 deletions packages/@glimmer/destroyable/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@
"@glimmer/interfaces": "workspace:*"
},
"devDependencies": {
"@glimmer-workspace/build-support": "workspace:*",
"@glimmer-workspace/env": "workspace:*",
"@glimmer/debug-util": "workspace:*",
"eslint": "^9.20.1",
"publint": "^0.3.2",
Expand Down
2 changes: 0 additions & 2 deletions packages/@glimmer/encoder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@
"@glimmer/vm": "workspace:*"
},
"devDependencies": {
"@glimmer-workspace/build-support": "workspace:*",
"@glimmer-workspace/env": "workspace:*",
"eslint": "^9.20.1",
"publint": "^0.3.2",
"rollup": "^4.34.8",
Expand Down
Loading
Loading