Restructure repo into five-package AFI architecture
Mizan is an Application Framework Interface (AFI) with five
independent packages:
packages/
mizan-ast/ Language layer (source → KDL schema)
mizan-schema/ IR layer (KDL schema definition)
mizan-rpc/ Protocol layer (client gen + server adapters)
adapters/django/ ← was django/
generator/ ← was react/src/generator/
mizan-csr/ State layer (client state engine)
adapters/react/ ← was react/
mizan-ssr/ Rendering layer (server-side rendering)
Each package is independent. The adapter directories contain the
framework-specific implementations. Stub packages (ast, schema, ssr)
establish the structure for future work.
264 Django tests + 33 React tests pass from new locations.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
17
Makefile
17
Makefile
@@ -1,27 +1,30 @@
|
|||||||
.PHONY: install test test-django test-react test-integration docker-up docker-down clean
|
.PHONY: install test test-django test-react test-integration docker-up docker-down clean
|
||||||
|
|
||||||
|
DJANGO = packages/mizan-rpc/adapters/django
|
||||||
|
REACT = packages/mizan-csr/adapters/react
|
||||||
|
|
||||||
# ─── Setup ───────────────────────────────────────────────────────────────────
|
# ─── Setup ───────────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
install:
|
install:
|
||||||
cd django && pip install -e ".[dev,channels]"
|
cd $(DJANGO) && uv pip install -e ".[dev,channels]"
|
||||||
cd react && npm install
|
cd $(REACT) && npm install
|
||||||
|
|
||||||
# ─── Unit Tests ──────────────────────────────────────────────────────────────
|
# ─── Unit Tests ──────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
test: test-django test-react
|
test: test-django test-react
|
||||||
|
|
||||||
test-django:
|
test-django:
|
||||||
cd django && pytest
|
cd $(DJANGO) && uv run pytest
|
||||||
|
|
||||||
test-react:
|
test-react:
|
||||||
cd react && npm test
|
cd $(REACT) && npm test
|
||||||
|
|
||||||
# ─── Integration Tests ──────────────────────────────────────────────────────
|
# ─── Integration Tests ──────────────────────────────────────────────────────
|
||||||
|
|
||||||
test-integration: docker-up
|
test-integration: docker-up
|
||||||
@echo "Waiting for backend..."
|
@echo "Waiting for backend..."
|
||||||
@timeout 30 sh -c 'until curl -sf http://localhost:8000/api/mizan/session/ > /dev/null 2>&1; do sleep 1; done'
|
@timeout 30 sh -c 'until curl -sf http://localhost:8000/api/mizan/session/ > /dev/null 2>&1; do sleep 1; done'
|
||||||
cd react && npm run test:integration
|
cd $(REACT) && npm run test:integration
|
||||||
@$(MAKE) docker-down
|
@$(MAKE) docker-down
|
||||||
|
|
||||||
# ─── Docker ──────────────────────────────────────────────────────────────────
|
# ─── Docker ──────────────────────────────────────────────────────────────────
|
||||||
@@ -41,6 +44,6 @@ test-all: test test-integration
|
|||||||
|
|
||||||
clean:
|
clean:
|
||||||
docker compose -f examples/django-react-site/docker-compose.test.yml down -v --remove-orphans 2>/dev/null || true
|
docker compose -f examples/django-react-site/docker-compose.test.yml down -v --remove-orphans 2>/dev/null || true
|
||||||
rm -rf django/src/mizan.egg-info django/dist django/build
|
rm -rf $(DJANGO)/src/mizan.egg-info $(DJANGO)/dist $(DJANGO)/build
|
||||||
rm -rf react/dist react/node_modules
|
rm -rf $(REACT)/dist $(REACT)/node_modules
|
||||||
rm -f examples/django-react-site/backend/db.sqlite3
|
rm -f examples/django-react-site/backend/db.sqlite3
|
||||||
|
|||||||
18
README.md
18
README.md
@@ -269,10 +269,10 @@ chat.send({ text: 'hello' })
|
|||||||
|
|
||||||
```bash
|
```bash
|
||||||
# Django unit tests
|
# Django unit tests
|
||||||
cd django && uv sync --extra dev --extra channels && uv run pytest
|
cd packages/mizan-rpc/adapters/django && uv sync --extra dev --extra channels && uv run pytest
|
||||||
|
|
||||||
# React unit tests
|
# React unit tests
|
||||||
cd react && npm test
|
cd packages/mizan-csr/adapters/react && npm test
|
||||||
|
|
||||||
# E2E integration tests (real browser, real backend)
|
# E2E integration tests (real browser, real backend)
|
||||||
docker compose -f examples/django-react-site/docker-compose.test.yml up -d
|
docker compose -f examples/django-react-site/docker-compose.test.yml up -d
|
||||||
@@ -287,10 +287,16 @@ make test-all
|
|||||||
|
|
||||||
```
|
```
|
||||||
mizan/
|
mizan/
|
||||||
django/ Python package (mizan)
|
packages/
|
||||||
react/ TypeScript package (@rythazhur/mizan)
|
mizan-ast/ Language layer (source → KDL schema)
|
||||||
|
mizan-schema/ IR layer (KDL schema definition)
|
||||||
|
mizan-rpc/ Protocol layer (client generation + server adapters)
|
||||||
|
adapters/django/ Django server adapter
|
||||||
|
generator/ Codegen CLI
|
||||||
|
mizan-csr/ State layer (client state engine + frontend adapters)
|
||||||
|
adapters/react/ React adapter
|
||||||
|
mizan-ssr/ Rendering layer (server-side rendering)
|
||||||
examples/
|
examples/
|
||||||
django-react-site/ E2E tests, React harness, Django backend
|
django-react-site/ E2E tests + Django backend
|
||||||
django-react-desktop-app/ PyWebView desktop app
|
django-react-desktop-app/ PyWebView desktop app
|
||||||
Makefile Test orchestration
|
|
||||||
```
|
```
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
|||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
# Install mizan from local source with channels support
|
# Install mizan from local source with channels support
|
||||||
COPY django/ /app/django/
|
COPY packages/mizan-rpc/adapters/django/ /app/django/
|
||||||
RUN pip install --no-cache-dir /app/django[channels] daphne
|
RUN pip install --no-cache-dir /app/django[channels] daphne
|
||||||
|
|
||||||
# Copy example app
|
# Copy example app
|
||||||
|
|||||||
@@ -10,9 +10,9 @@ export default {
|
|||||||
source: {
|
source: {
|
||||||
django: {
|
django: {
|
||||||
managePath: path.join(root, 'examples/django-react-site/backend/manage.py'),
|
managePath: path.join(root, 'examples/django-react-site/backend/manage.py'),
|
||||||
command: [path.join(root, 'django/.venv/bin/python')],
|
command: [path.join(root, 'packages/mizan-rpc/adapters/django/.venv/bin/python')],
|
||||||
env: {
|
env: {
|
||||||
PYTHONPATH: `${path.join(root, 'django/src')}:${path.join(root, 'examples/django-react-site/backend')}`,
|
PYTHONPATH: `${path.join(root, 'packages/mizan-rpc/adapters/django/src')}:${path.join(root, 'examples/django-react-site/backend')}`,
|
||||||
DJANGO_SETTINGS_MODULE: 'testapp.settings',
|
DJANGO_SETTINGS_MODULE: 'testapp.settings',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user